Support modular X in DEPEND. Removed old ebuild and patches.

Package-Manager: portage-2.1_pre1

7 files changed, 58 insertions, 49 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 9f9e5f5410b0..1505be11c418 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.38 2005/11/02 20:08:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.39 2005/12/18 12:42:25 nelchael Exp $
+
+*rss-glx-0.8.0-r3 (18 Dec 2005)
+
+  18 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/rss-glx-0.7.4-kdedesktop.patch,
+  -files/rss-glx-0.8.0-kdedesktop.patch, -rss-glx-0.7.6.ebuild,
+  +rss-glx-0.8.0-r3.ebuild:
+  Support modular X in DEPEND. Removed old ebuild and patches.
 
   02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
   rss-glx-0.8.0-r2.ebuild:
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index bdfcef6d6440..832f637e464d 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,13 +1,11 @@
-MD5 ab026edcc68c781e9dbc0b01a5e4a289 ChangeLog 6791
-MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6 67
+MD5 39172b25f756dc1c8ccaf5398ccd187d ChangeLog 7074
 MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r2 67
+MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r3 67
 MD5 4dbe321921028a106a05564a14b2f814 files/jwz-vroot.h 6234
-MD5 2f47a2d4b9947332e2817ec81f2ec0d7 files/rss-glx-0.7.4-kdedesktop.patch 833
 MD5 2ef57cb76733985320d72f9ca147f109 files/rss-glx-0.8.0-assert.patch 553
 MD5 9ffedb9bb790a6ff0bb9b3e64c6c6675 files/rss-glx-0.8.0-configure.in.patch 642
 MD5 b50c007842cc6ee24f667e1755b2bb6c files/rss-glx-0.8.0-hyperspace-install-fix.patch 1574
-MD5 9b4404f02157380acbe80165fb4b7bf2 files/rss-glx-0.8.0-kdedesktop.patch 854
 MD5 643bf4d6986ea275bc5b21a5626657c2 files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 f0cd42c6c25e1e81ff8e16105f59cd2d rss-glx-0.7.6.ebuild 4057
 MD5 1c3d19c7c4c92c2b88d78cbc6bc0bee2 rss-glx-0.8.0-r2.ebuild 4919
+MD5 6892bf4a7d74d7351b649aea07ce855e rss-glx-0.8.0-r3.ebuild 4945
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.7.6 b/x11-misc/rss-glx/files/digest-rss-glx-0.7.6
deleted file mode 100644
index b51e11ba19ed..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c896bd55e9ffdfad69bda4422b42e03b rss-glx_0.7.6.tar.bz2 4978215
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r3 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r3
new file mode 100644
index 000000000000..8ecb6e1faf3b
--- /dev/null
+++ b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r3
@@ -0,0 +1 @@
+MD5 d04e909521626a27f9f6d9b5f8a24d6c rss-glx_0.8.0.tar.bz2 5239207
diff --git a/x11-misc/rss-glx/files/rss-glx-0.7.4-kdedesktop.patch b/x11-misc/rss-glx/files/rss-glx-0.7.4-kdedesktop.patch
deleted file mode 100644
index d8f082eca346..000000000000
--- a/x11-misc/rss-glx/files/rss-glx-0.7.4-kdedesktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rss_glx-0.7.4/reallyslick/cpp_src/Makefile.in	2003-06-02 15:38:07.000000000 +0100
-+++ rss_glx-0.7.4/reallyslick/cpp_src/Makefile.in	2003-06-02 15:38:34.000000000 +0100
-@@ -139,7 +139,7 @@
- 
- @INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml plasma.xml skyrocket.xml solarwinds.xml
- 
--@INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
-+@INSTALL_KDE_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
- 
- man_MANS = cyclone.1 fieldlines.1 flocks.1 flux.1 helios.1 plasma.1 skyrocket.1 solarwinds.1
- 
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.0-kdedesktop.patch b/x11-misc/rss-glx/files/rss-glx-0.8.0-kdedesktop.patch
deleted file mode 100644
index a63924b34408..000000000000
--- a/x11-misc/rss-glx/files/rss-glx-0.8.0-kdedesktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- reallyslick/cpp_src/Makefile.in	2005-04-10 03:46:04.000000000 +0100
-+++ reallyslick/cpp_src/Makefile.in.new	2005-04-20 15:29:55.786785182 +0100
-@@ -171,7 +171,7 @@
- 
- @INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml
- 
--@INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.xml plasma.desktop skyrocket.desktop solarwinds.desktop
-+@INSTALL_KDE_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.xml plasma.desktop skyrocket.desktop solarwinds.desktop
- 
- man_MANS = cyclone.1 fieldlines.1 flocks.1 flux.1 helios.1 plasma.1 skyrocket.1 solarwinds.1
- 
diff --git a/x11-misc/rss-glx/rss-glx-0.7.6.ebuild b/x11-misc/rss-glx/rss-glx-0.8.0-r3.ebuild
index 2d148b12a773..146361a4da85 100644
--- a/x11-misc/rss-glx/rss-glx-0.7.6.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.7.6.ebuild,v 1.20 2005/07/13 14:34:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.0-r3.ebuild,v 1.1 2005/12/18 12:42:25 nelchael Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,19 +12,38 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64 ~sparc"
-IUSE="kde sse 3dnow openal"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="kde sse 3dnow openal xscreensaver"
 
-DEPEND="virtual/x11
+DEPEND="|| ( virtual/x11 x11-libs/libXt )
 	virtual/opengl
 	>=media-gfx/imagemagick-5.5.7
-	kde? ( || ( kde-base/kdeartwork-meta kde-base/kdeartwork ) )
-	!kde? ( x11-misc/xscreensaver )
+	kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) )
+	!kde? ( >=x11-misc/xscreensaver-4.22-r2 )
+	xscreensaver? ( >=x11-misc/xscreensaver-4.22-r2 )
 	openal? ( media-libs/openal )"
 
+pkg_setup() {
+	if use kde && use xscreensaver ; then
+		if ! built_with_use kde-base/kdeartwork-kscreensaver xscreensaver && \
+		   ! built_with_use kde-base/kdeartwork xscreensaver ; then
+			eerror "rss-glx wont work nicely with kde unless you emerge"
+			eerror "kde-base/kdeartwork or kde-base/kdeartwork-kscreensaver"
+			eerror "with USE=xscreensaver."
+			eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212"
+			die "Please re-emerge your KDE with USE=xscreensaver"
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.7.4-kdedesktop.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.8.0-r2-kdedesktop.patch
+	epatch ${FILESDIR}/${PN}-0.8.0-assert.patch
+	epatch ${FILESDIR}/${PN}-0.8.0-configure.in.patch
+	epatch ${FILESDIR}/${PN}-0.8.0-hyperspace-install-fix.patch
+	cp ${FILESDIR}/jwz-vroot.h ${S}/include/vroot.h
 }
 
 src_compile() {
@@ -32,8 +51,8 @@ src_compile() {
 
 	local myconf
 
-	myconf="${myconf} --bindir=/usr/lib/xscreensaver" \
-	myconf="${myconf} --with-configdir=/usr/share/control-center/screensavers/" \
+	myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \
+	myconf="${myconf} --with-configdir=/usr/share/xscreensaver/config/" \
 
 	if use kde; then
 		find . -name '*.desktop' -exec \
@@ -46,26 +65,31 @@ src_compile() {
 		myconf="${myconf} --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers"
 	fi
 
+	# Hardenable SIMD extensions on amd64
+	if use amd64 ; then
+		myconf="${myconf} --enable-sse --enable-3dnow"
+	elif use x86 ; then
+		myconf="${myconf} $(use_enable sse) $(use_enable 3dnow)"
+	fi
+
 	econf \
-		`use_enable sse` \
-		`use_enable 3dnow` \
-		`use_enable openal sound` \
-		${myconf} || die
-	emake || die
+		$(use_enable openal sound) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "install failed"
-	dodoc COPYING INSTALL README README.xscreensaver
+	dodoc README README.xscreensaver
 
 	# symlink to satisfy kde's kxs*
 	use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
 }
 
 pkg_postinst() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver"
+	local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver"
 
-	if [ -f ${XSCREENSAVER_CONF} -a -z "`grep 'Euphoria' ${XSCREENSAVER_CONF}`" ]; then
+	if [ -f ${XSCREENSAVER_CONF} ]; then
 		einfo "Adding Really Slick Screensavers to XScreenSaver"
 		sed -e '/*programs:/a\
 	GL:       \"Cyclone\"  cyclone --root     \\n\\\
@@ -74,6 +98,7 @@ pkg_postinst() {
 	GL:        \"Flocks\"  flocks --root      \\n\\\
 	GL:          \"Flux\"  flux --root        \\n\\\
 	GL:        \"Helios\"  helios --root      \\n\\\
+	GL:    \"Hyperspace\"  hyperspace --root  \\n\\\
 	GL:       \"Lattice\"  lattice --root     \\n\\\
 	GL:        \"Plasma\"  plasma --root      \\n\\\
 	GL:     \"Skyrocket\"  skyrocket --root   \\n\\\
@@ -90,13 +115,12 @@ pkg_postinst() {
 
 	else
 		einfo "Unable to add these to XScreenSaver configuration"
-		einfo "Read /usr/share/doc/${PF}/README.xscreensaver.gz for"
-		einfo "entries to add to your ~/.xscreensaver file to enable these hacks"
+		einfo "This should not happen. Please file a bug"
 	fi
 }
 
 pkg_postrm() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/X11R6/lib/X11/app-defaults/XScreenSaver"
+	local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver"
 
 	has_version x11-misc/rss-glx && return 0
 	if [ -f ${XSCREENSAVER_CONF} ]; then
@@ -108,6 +132,7 @@ pkg_postrm() {
 			-e '/\"Flocks\"  flocks/d' \
 			-e '/\"Flux\"  flux/d' \
 			-e '/\"Helios\"  helios/d' \
+			-e '/\"Hyperspace\"  hyperspace/d' \
 			-e '/\"Lattice\"  lattice/d' \
 			-e '/\"Plasma\"  plasma/d' \
 			-e '/\"Skyrocket\"  skyrocket/d' \