Finally bump to 2.7_beta. Thanks to David Leverton for the autotools patches. Fixes #272050

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 112 insertions, 1 deletions

diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index cc4cc16e72f5..1219fb429b4a 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/electricsheep
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.43 2009/05/01 18:41:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.44 2009/09/17 21:56:05 patrick Exp $
+
+*electricsheep-2.7_beta11 (17 Sep 2009)
+
+  17 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +electricsheep-2.7_beta11.ebuild, +files/electricsheep-gnome.patch,
+  +files/electricsheep-xdg-utils.patch:
+  Finally bump to 2.7_beta. Thanks to David Leverton for the autotools
+  patches. Fixes #272050
 
 *electricsheep-2.6.8-r3 (01 May 2009)
 
diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
new file mode 100644
index 000000000000..f81760429dc9
--- /dev/null
+++ b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.1 2009/09/17 21:56:05 patrick Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic kde-functions autotools
+
+DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
+HOMEPAGE="http://electricsheep.org/"
+SRC_URI="http://dev.gentooexperimental.org/~dreeevil/electricsheep-2.7_beta11.tar.bz2"
+
+IUSE="kde" #gnome
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/expat
+	>=gnome-base/libglade-2.5.0:2.0
+	media-video/ffmpeg
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.7.0:2
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	app-arch/gzip
+	media-gfx/flam3
+	media-video/mplayer
+	net-misc/curl
+	x11-misc/xdg-utils
+	kde? ( kde-base/kscreensaver )"
+#	gnome? ( gnome-extra/gnome-screensaver )
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-gnome.patch
+	eautoreconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	# install the xscreensaver config file
+	insinto /usr/share/xscreensaver/config
+	doins ${PN}.xml || die "${PN}.xml failed"
+
+	if use kde; then
+		set-kdedir
+		insinto /usr/share/applications
+		newins ${PN}.desktop{.kde,} || die "${PN}.desktop.kde failed"
+		insinto "${KDEDIR}/share/applnk/System/ScreenSavers"
+		newins ${PN}.desktop{.kde,} || die "${PN}.desktop.kde failed"
+	fi
+
+	#if use gnome; then
+	#	insinto /usr/share/applications/screensavers
+	#	doins ${PN}.desktop || die "${PN}.desktop failed"
+	#	exeinto /usr/libexec/gnome-screensaver
+	#	doexe ${PN}-saver || die "${PN}-saver failed"
+	#fi
+}
diff --git a/x11-misc/electricsheep/files/electricsheep-gnome.patch b/x11-misc/electricsheep/files/electricsheep-gnome.patch
new file mode 100644
index 000000000000..bea649edb0bd
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-gnome.patch
@@ -0,0 +1,25 @@
+Index: client/Makefile.am
+===================================================================
+--- client/Makefile.am	(revision 1257)
++++ client/Makefile.am	(working copy)
+@@ -28,20 +28,3 @@
+ 	electricsheep-preferences.glade electricsheep.h electricsheep-saver \
+ 	16_electricsheep 
+ 
+-GNOME_SCREENSAVER_DATADIR = $(shell pkg-config --variable themesdir gnome-screensaver)
+-GNOME_SCREENSAVER_PRIVEXEDIR = $(shell pkg-config --variable privlibexecdir gnome-screensaver)
+-
+-install-data-local:
+-	-$(INSTALL) electricsheep.desktop $(GNOME_SCREENSAVER_DATADIR)
+-	-$(INSTALL) electricsheep-saver $(GNOME_SCREENSAVER_PRIVEXEDIR)
+-	-$(INSTALL) -d $(pkgdatadir)
+-	-$(INSTALL) 16_electricsheep /usr/share/gconf/defaults
+-	-update-gconf-defaults
+-
+-uninstall-local:
+-	-rm /usr/share/gconf/defaults/16_electricsheep
+-	-rm -rf $(pkgdatadir)
+-	-rm $(GNOME_SCREENSAVER_PRIVEXEDIR)/electricsheep-saver
+-	-rm $(GNOME_SCREENSAVER_DATADIR)/electricsheep.desktop
+-	-update-gconf-defaults
+-
diff --git a/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
new file mode 100644
index 000000000000..4ca38158c741
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
@@ -0,0 +1,15 @@
+Index: client/electricsheep-preferences.c
+===================================================================
+--- client/electricsheep-preferences.c	(revision 1257)
++++ client/electricsheep-preferences.c	(working copy)
+@@ -121,8 +121,8 @@
+ }
+ 
+ void on_helpButton_clicked(GtkWidget *widget, gpointer user_data) {
+-    if (system("gnome-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
+-	perror("gnome-open");
++    if (system("xdg-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
++	perror("xdg-open");
+ }
+ 
+ static void tick() {