Run gnome2_src_prepare at proper place (#405259 by Szymluk), remove old.

(Portage version: 2.1.10.52/cvs/Linux x86_64)

4 files changed, 8 insertions, 199 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index e3a6f8731b0b..dc5bb0591070 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.151 2012/03/14 07:00:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.152 2012/04/01 17:44:54 pacho Exp $
+
+  01 Apr 2012; Pacho Ramos <pacho@gentoo.org> -gnome-screensaver-2.30.2.ebuild,
+  -gnome-screensaver-3.2.1.ebuild, gnome-screensaver-2.30.2-r1.ebuild:
+  Run gnome2_src_prepare at proper place (#405259 by Szymluk), remove old.
 
 *gnome-screensaver-3.2.2 (14 Mar 2012)
 
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild
index b304d13ae8dd..2bbf480cebbd 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild,v 1.8 2011/11/28 18:38:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild,v 1.9 2012/04/01 17:44:54 pacho Exp $
 
 EAPI="2"
 
@@ -64,8 +64,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# libnotify support was removed from trunk, so not needed for next release
 	epatch "${FILESDIR}/${P}-libnotify-0.7.patch"
 
@@ -91,6 +89,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild
deleted file mode 100644
index 58cb4c19e078..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.10 2011/11/28 18:38:09 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-SRC_URI="${SRC_URI}
-	branding? ( http://www.gentoo.org/images/gentoo-logo.svg )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-KERNEL_IUSE="kernel_linux"
-IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE"
-
-RDEPEND=">=gnome-base/gconf-2.6.1:2
-	>=x11-libs/gtk+-2.14.0:2
-	>=gnome-base/gnome-desktop-2.29.0:2
-	>=gnome-base/gnome-menus-2.12:0
-	>=dev-libs/glib-2.15:2
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-	libnotify? ( x11-libs/libnotify )
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_with opengl gl)
-		$(use_enable pam)
-		--enable-locking
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
-}
-
-src_prepare() {
-	# libnotify support was removed from trunk, so not needed for next release
-	epatch "${FILESDIR}/${P}-libnotify-0.7.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the conversion script in the documentation
-	dodoc "${S}/data/migrate-xscreensaver-config.sh"
-	dodoc "${S}/data/xscreensaver-config.xsl"
-
-	# Conversion information
-	sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \
-		> "${S}/xss-conversion.txt" || die "sed failed"
-
-	dodoc "${S}/xss-conversion.txt"
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/gnome-screensaver-dialog
-	fi
-
-	if use branding ; then
-		insinto /usr/share/pixmaps/
-		doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed"
-		insinto /usr/share/applications/screensavers/
-		doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-
-		echo
-	fi
-
-	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild
deleted file mode 100644
index e2d414f63b09..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild,v 1.2 2012/02/14 04:24:33 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam systemd"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-3.1.91:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/gnome-icon-theme-symbolic
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable pam locking)
-		$(use_with systemd)
-		--with-mit-ext
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--disable-schemas-compile"
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-	# xscreensaver and custom screensaver capability removed
-	# poke and inhibit commands were also removed, bug 579430
-}