Update for makepkg 4.1

2 files changed, 17 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e5250763113..71d18ab2006d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = eweather-svn
-	pkgdesc = Enlightenment e17 module: Eweather
+	pkgdesc = Enlightenment module: Current weather and forcast gadget
 	pkgver = 82790
 	pkgrel = 1
 	url = http://www.enlightenment.org
@@ -9,7 +9,10 @@ pkgbase = eweather-svn
 	makedepends = subversion
 	depends = libeweather-svn
 	depends = enlightenment17
+	conflicts = e-modules-extra
 	options = !libtool
+	source = eweather::svn+http://svn.enlightenment.org/svn/e/trunk/E-MODULES-EXTRA/eweather
+	md5sums = SKIP
 
 pkgname = eweather-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 4516c19a121d..fbb2b7818bc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,28 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eweather-svn
+_pkgname=eweather
 pkgver=82790
 pkgrel=1
-pkgdesc="Enlightenment e17 module: Eweather"
+pkgdesc="Enlightenment module: Current weather and forcast gadget"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('LGPL2.1')
 depends=('libeweather-svn' 'enlightenment17')
 makedepends=('subversion')
+conflicts=('e-modules-extra')
 options=('!libtool')
+source=("$_pkgname::svn+http://svn.enlightenment.org/svn/e/trunk/E-MODULES-EXTRA/$_pkgname")
+md5sums=('SKIP')
 
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/E-MODULES-EXTRA/eweather"
-_svnmod="eweather"
+pkgver() {
+  cd "$startdir/$_pkgname"
 
-build() {
-  cd "$srcdir"
-
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$_svnmod/.svn" ]]; then
-    (cd "$_svnmod" && svn up -r "$pkgver")
-  else
-    svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
+  svnversion .
+}
 
-  rm -rf "$srcdir/$_svnmod-build"
-  svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
-  cd "$srcdir/$_svnmod-build"
+build() {
+  cd "$startdir/$_pkgname"
 
   ./autogen.sh --prefix=/usr
 
@@ -39,8 +31,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_svnmod-build"
-  make DESTDIR="$pkgdir" install
+  cd "$startdir/$_pkgname"
 
-  rm -r "$srcdir/$_svnmod-build"
+  make DESTDIR="$pkgdir" install
 }