Update to current packaging standards

2 files changed, 29 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bea7260fb4ae..3b7055c4ebfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,13 @@
 pkgbase = ephoto-svn
-	pkgdesc = Ephoto is an light image viewer
+	pkgdesc = A light image viewer based on EFL
 	pkgver = 50446
 	pkgrel = 1
 	url = http://www.enlightenment.org
 	arch = i686
 	arch = x86_64
-	groups = e17-libs-svn
-	groups = e17-svn
 	license = BSD
 	makedepends = subversion
-	makedepends = cvs
-	depends = edje-svn
-	depends = evas-svn
-	depends = ethumb-svn
-	depends = ecore-svn
-	depends = eet-svn
-	depends = elementary-svn
-	depends = eio-svn
-	provides = ephoto
-	conflicts = ephoto
+	depends = elementary
 	options = !libtool
 
 pkgname = ephoto-svn
diff --git a/PKGBUILD b/PKGBUILD
index 9e076b8e1aa2..016ce9290b6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,47 @@
-# $Id: PKGBUILD 14603 2010-04-05 17:52:20Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ephoto-svn
 pkgver=50446
 pkgrel=1
-pkgdesc="Ephoto is an light image viewer"
+pkgdesc="A light image viewer based on EFL"
 arch=('i686' 'x86_64')
-groups=('e17-libs-svn' 'e17-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('edje-svn' 'evas-svn' 'ethumb-svn' 'ecore-svn' 'eet-svn' 'elementary-svn' 'eio-svn')
-makedepends=('subversion' 'cvs')
-conflicts=('ephoto')
-provides=('ephoto')
+depends=('elementary')
+makedepends=('subversion')
 options=('!libtool')
-source=()
-md5sums=()
-
 _svntrunk="http://svn.enlightenment.org/svn/e/trunk/ephoto"
 _svnmod="ephoto"
 
 build() {
-  cd $srcdir
-
-  if [ $NOEXTRACT -eq 0 ]; then
-    msg "Connecting to $_svntrunk SVN server...."
-    if [ -d $_svnmod/.svn ]; then
-      (cd $_svnmod && svn up -r $pkgver)
-    else
-      svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-    fi
+  cd "$srcdir"
 
-    msg "SVN checkout done or server timeout"
-    msg "Starting make..."
+  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
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-  ./autogen.sh --prefix=/usr 
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+
+  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"
+
+  ./autogen.sh --prefix=/usr
+
+  make
+}
+
+package() {
+  make DESTDIR="$pkgdir" install
 
 # install license files
-  install -Dm644 $srcdir/$_svnmod-build/COPYING \
-  	$pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  rm -r $startdir/src/$_svnmod-build
+  rm -r "$srcdir/$_svnmod-build"
 }