Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/performous/PKGBUILD
	community-testing/oss/PKGBUILD
	community-testing/picard/PKGBUILD
	community/deadbeef/PKGBUILD
	community/gnash/PKGBUILD
	community/mplayer2/PKGBUILD
	community/radvd/PKGBUILD
	community/tinc/PKGBUILD
	core/glibc/PKGBUILD
	core/lvm2/PKGBUILD
	core/util-linux/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/boost/PKGBUILD
	extra/cppunit/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kradio/PKGBUILD
	extra/opal/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postfix/PKGBUILD
	extra/ptlib/PKGBUILD
	extra/xine-lib/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kdm.service
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	libre/virtualbox-libre/PKGBUILD
	libre/virtualbox-modules-lts/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-e2fsprogs/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libidn/PKGBUILD
	multilib/lib32-libjpeg-turbo/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	staging/ekiga/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	testing/glibc/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kdm.service
	testing/nilfs-utils/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 35 insertions, 20 deletions

diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index f2ac0230c..204beaf52 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,37 +1,52 @@
-# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $
+# $Id: PKGBUILD 73470 2012-07-08 09:29:58Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
-pkgver=2.7b12
-pkgrel=5
+pkgver=2.7b33
+pkgrel=1
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
 license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
-makedepends=('xscreensaver')
+depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee')
+makedepends=('boost' 'tinyxml')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch)
-sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
-          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825'
-          'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a')
+options=('!emptydirs')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
+          'fda3aae435507d03973f0c4d1ed3509067657f06')
+
+# source PKGBUILD && mksource
+mksource() {
+  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+  _svnver=r125
+  _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic"
+  _svnmod="${pkgname}-${pkgver}"
+  mkdir ${pkgname}-${pkgver}
+  pushd ${pkgname}-${pkgver}
+  svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod}
+  find . -depth -type d -name .svn -exec rm -rf {} \;
+  (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \
+    Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig)
+  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+  popd
+  rm -r ${pkgname}-${pkgver}
+  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
-  patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch"
+  sed -i 's/wx-config/wx-config-2.9/g' configure.ac
+  sed -i '12 i\
+#include <cstdio>' Common/Singleton.h
+  ./autogen.sh
   ./configure --prefix=/usr
-  make
+  make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/applications/screensavers"
-  install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver"
-  make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \
-    GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install
-  install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml"
-  install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
+  install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
 }