Makepkg 4.1 update; remove patch, fixed upstream

2 files changed, 32 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48cf2095c1b2..c206008c931e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,6 @@ pkgbase = ewebkit-svn
 	depends = libsoup
 	depends = libxslt
 	depends = libxt
-	md5sums = bba54046ca64ac77344e30a4add78e0d
 
 pkgname = ewebkit-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d3738ed4743..2e84fcad01ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,50 @@
 # Contributor: twa022 <twa022 at gmail dot com>
 
 pkgname=ewebkit-svn
+_pkgname=ewebkit
 pkgver=146904
 pkgrel=2
 pkgdesc="WebKit ported to the Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
 url="http://trac.webkit.org/wiki/EFLWebKit"
+_svntrunk="https://svn.webkit.org/repository/webkit/trunk"
 license=('LGPL2' 'LGPL2.1' 'BSD')
 depends=('atk' 'edje' 'eeze' 'efreet' 'e_dbus' 'enchant' 'sqlite' 'libtiff'
          'gst-plugins-base-libs' 'libsoup' 'libxslt' 'libxt')
 makedepends=('cmake' 'subversion' 'perl' 'python2' 'ruby' 'gperf')
-md5sums=("bba54046ca64ac77344e30a4add78e0d")
+if [[ -d "$startdir/$_pkgname/.svn" ]]; then
+  source=("$_pkgname::svn+$_svntrunk")
+  md5sums=("SKIP")
+fi
 
-_svntrunk=https://svn.webkit.org/repository/webkit/trunk
-_svnmod=Webkit
+pkgver() {
+  if [[ -d "$startdir/$_pkgname/.svn" ]]; then
+    svnversion "$startdir/$_pkgname"
+  else
+    svnversion "$_svntrunk"
+  fi
+}
 
-build() {
-  cd "$srcdir"
+prepare() {
+  cd "$startdir"
 
-  msg "Connecting to SVN server...."
+  if [[ ! -d "$_pkgname/.svn" ]]; then
+#   if this is the first run, checkout only what we need from the repo
+    msg2 "$(gettext "Cloning %s %s repo...")" "$_pkgname" "svn"
+    svn co --depth immediates --config-dir "$_pkgname" -r "$pkgver" "$_svntrunk" "$_pkgname"
+    cd "$_pkgname"
+    svn up --set-depth infinity -r "$pkgver" Source
+    svn up --set-depth infinity -r "$pkgver" Tools
 
-  if [[ -d "$_svnmod/.svn" ]]; then
-    (cd "$_svnmod" && svn up -r "$pkgver")
-  else
-    svn co "$_svntrunk" --depth immediates --config-dir ./ -r "$pkgver" "$_svnmod"
-    cd "$_svnmod"
-    svn up --set-depth infinity Source -r "$pkgver"
-    svn up --set-depth infinity Tools -r "$pkgver"
+#   and create a working copy
+    msg2 "$(gettext "Creating working copy of %s %s repo...")" "$_pkgname" "svn"
+    rm -rf "$srcdir/$_pkgname"
+    svn export "$startdir/$_pkgname" "$srcdir/$_pkgname"
   fi
+}
 
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_svnmod-build"
-  svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
-  cd "$srcdir/$_svnmod-build"
+build() {
+  cd "$srcdir/$_pkgname"
 
   cmake . \
 	-DPORT=Efl \
@@ -50,16 +60,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_svnmod-build"
+  cd "$srcdir/$_pkgname"
 
   make DESTDIR="$pkgdir" install
 
 # install license files
-  install -Dm644 "$srcdir/$_svnmod-build/Source/WebCore/LICENSE-APPLE" \
-	"$pkgdir/usr/share/licenses/$pkgname/LICENSE-APPLE"
-
-  install -Dm644 "$srcdir/$_svnmod-build/Source/WebCore/LICENSE-LGPL-2" \
-	"$pkgdir/usr/share/licenses/$pkgname/LICENSE-LGPL-2"
-
-  rm -r "$srcdir/$_svnmod-build"
+  install -Dm644 Source/WebCore/LICENSE-APPLE "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APPLE"
+  install -Dm644 Source/WebCore/LICENSE-LGPL-2 "$pkgdir/usr/share/licenses/$pkgname/LICENSE-LGPL-2"
 }