Updated to use new repo at github.

2 files changed, 23 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2ec4ea996e6..56156aba64b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electricsheep-svn
 	pkgdesc = A screensaver that realize the collective dream of sleeping computers from all over the Internet
-	pkgver = 160
-	pkgrel = 3
+	pkgver = r134
+	pkgrel = 1
 	url = http://www.electricsheep.org/
 	arch = i686
 	arch = x86_64
@@ -21,7 +21,9 @@ pkgbase = electricsheep-svn
 	depends = tinyxml
 	depends = wxgtk
 	provides = electricsheep-svn
+	source = electricsheep-svn::svn+https://github.com/scottdraves/electricsheep/
 	source = electricsheep-160.patch
+	sha1sums = SKIP
 	sha1sums = 02c507eff0fccd13071c157bda44231294e17e56
 
 pkgname = electricsheep-svn
diff --git a/PKGBUILD b/PKGBUILD
index cb150fb66897..e0bf5d9f760f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
+# Maintainer: Andrew Reed <reed.995 at osu dot edu>
 # Contributor: Hideaki <hideaki at gmail dot com>
 # Contributor:  hnrch <heinrichmen at gmail dot com>
 # Contributor: Zbynek Novotny <znovotny at gmail dot com>
-# Maintainer: Andrew Reed <reed.995 at osu dot edu>
 
 pkgname=electricsheep-svn
-pkgver=160
-pkgrel=3
+pkgver=r134
+pkgrel=1
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the Internet"
 url="http://www.electricsheep.org/"
 arch=('i686' 'x86_64')
@@ -14,45 +14,31 @@ license=('GPLv2')
 depends=('boost' 'curl' 'expat' 'flam3' 'glee' 'gtk2' 'ffmpeg' 'libglade' 'libgtop' 'libpng' 'lua' 'tinyxml' 'wxgtk')
 makedepends=('subversion')
 provides=('electricsheep-svn')
-conflicts=()
-replaces=()
 
-source=('electricsheep-160.patch')
-sha1sums=('02c507eff0fccd13071c157bda44231294e17e56')
+source=("$pkgname::svn+https://github.com/scottdraves/electricsheep/"
+        'electricsheep-160.patch')
+        
 
-_svntrunk="http://electricsheep.googlecode.com/svn/trunk"
-_svnmod="electricsheep"
-
-build() {
-    cd "$srcdir"
+sha1sums=('SKIP'
+          '02c507eff0fccd13071c157bda44231294e17e56')
 
-    msg "Starting SVN checkout..."
-    if [[ -d "$pkgname/.svn" ]]; then
-        msg2 "Found checked out repository"
-        (cd "$pkgname" && svn up -r $pkgver)
-    else
-        msg2 "Checking out new repository"
-        svn co $_svntrunk --config-dir ./ -r $pkgver "$pkgname"
-    fi
+pkgver() {
+    cd "$pkgname"
+    local ver="$(svnversion)"
+    printf "r%s" "${ver//[[:alpha:]]}"
+}
 
-    cd "${pkgname}"
-    patch -p0 < "${startdir}/electricsheep-160.patch"
-    cd ..
+build() {
+    cd "${srcdir}/${pkgname}/trunk"
 
-    msg2 "Setting up build directory..."
-    if [[ -d "$srcdir/$pkgname-build" ]]; then
-        (rm -rf "$srcdir/$pkgname-build")
-    fi
-    cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-    cd "$srcdir/$pkgname-build/client_generic"
-    mkdir -p m4
+    #TODO: Apply patch only if it hasn't been applied already
+    patch --forward -p0 < "${srcdir}/electricsheep-160.patch"
 
-    msg2 "Configuring..."
+    cd "client_generic"
     ./autogen.sh
     ./configure --prefix=/usr
     make || return 1
 
-    #
     # Hack to get ElectricSheep to show up and work with gnome-shell
     #
     #mkdir -p "$pkgdir/usr/share/applications/screensavers" "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver/"
@@ -62,7 +48,6 @@ build() {
 
 
 package() {
-    cd "${srcdir}/${pkgname}-build/client_generic"
-    msg "${pwd}"
+    cd "${srcdir}/${pkgname}/trunk/client_generic"
     make DESTDIR=$pkgdir install 
 }