Fix bug #142197 - install location of desktop files.

Package-Manager: portage-2.1.1_rc1-r2

3 files changed, 21 insertions, 164 deletions

diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 25e38511e36a..a22814d90017 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jwz-vroot.h 6234 RMD160 92aabe5424720238ccf2214260c7830718414d2f SHA1 0119753211cc0b3f7a13650e4173b6b11a416d11 SHA256 fcd4b00bff5f57b739d98dae40b98137f63a478abef2fcb3e0be8b256ea27f57
 MD5 4dbe321921028a106a05564a14b2f814 files/jwz-vroot.h 6234
 RMD160 92aabe5424720238ccf2214260c7830718414d2f files/jwz-vroot.h 6234
@@ -40,14 +43,14 @@ EBUILD rss-glx-0.8.1-r1.ebuild 4803 RMD160 eddd5600137493770b57abeafb4de79fd1c81
 MD5 507e74e3dbee52e7cae50cd22916d1ed rss-glx-0.8.1-r1.ebuild 4803
 RMD160 eddd5600137493770b57abeafb4de79fd1c81b70 rss-glx-0.8.1-r1.ebuild 4803
 SHA256 d690ac9bf6431dc50742ee207a1b054965090faf0f96dbd6eda7d5b89590a4a4 rss-glx-0.8.1-r1.ebuild 4803
-EBUILD rss-glx-0.8.1-r2.ebuild 4881 RMD160 87b81876871ef4b112dd1906905fd272593ab851 SHA1 3cd1771826e69ba5f265af8155d3d6b1d72014b0 SHA256 67eda0ea27006e6dc37761b5b62abbaacd1bd95a0d6d67268144f4d584a47afe
-MD5 829eb5f4a6da33626fbe03e83699e230 rss-glx-0.8.1-r2.ebuild 4881
-RMD160 87b81876871ef4b112dd1906905fd272593ab851 rss-glx-0.8.1-r2.ebuild 4881
-SHA256 67eda0ea27006e6dc37761b5b62abbaacd1bd95a0d6d67268144f4d584a47afe rss-glx-0.8.1-r2.ebuild 4881
-MISC ChangeLog 8501 RMD160 6ca57147f5c32371312aa5f3db0a30cfbe3fa776 SHA1 efffe95323b6806efa2b434d2ec1121570dce65a SHA256 6a924b2b1def6ad711947b1cba0d06092f29239fdd3b0a3d512b11929df6c517
-MD5 052c3bb9b9bb6d713babdf36452a10d4 ChangeLog 8501
-RMD160 6ca57147f5c32371312aa5f3db0a30cfbe3fa776 ChangeLog 8501
-SHA256 6a924b2b1def6ad711947b1cba0d06092f29239fdd3b0a3d512b11929df6c517 ChangeLog 8501
+EBUILD rss-glx-0.8.1-r3.ebuild 4868 RMD160 ca3c3828bce8f1e11b7a027ae81961c4ebfcf133 SHA1 8aaa3cb322e765e250cf7d0c40eaebfe5b5f6556 SHA256 9f46371458ce1ce1ffa8eaec2afe51909ef4c0e6a56331c76d7ae198b26133c3
+MD5 ddd329bce35b7d6482b08186d5a3f4e0 rss-glx-0.8.1-r3.ebuild 4868
+RMD160 ca3c3828bce8f1e11b7a027ae81961c4ebfcf133 rss-glx-0.8.1-r3.ebuild 4868
+SHA256 9f46371458ce1ce1ffa8eaec2afe51909ef4c0e6a56331c76d7ae198b26133c3 rss-glx-0.8.1-r3.ebuild 4868
+MISC ChangeLog 8696 RMD160 c39243518093c423be24d803c5149a30eba37521 SHA1 ea29dca0decbd4cdfbf675de3309a92b7c137585 SHA256 96392dafa0a113a2ba077a37af50d64ae0e7724011e33db6d6134d710fd26eae
+MD5 9d929968c747058af2dde32c169d8c65 ChangeLog 8696
+RMD160 c39243518093c423be24d803c5149a30eba37521 ChangeLog 8696
+SHA256 96392dafa0a113a2ba077a37af50d64ae0e7724011e33db6d6134d710fd26eae ChangeLog 8696
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -61,6 +64,13 @@ SHA256 583edb2d1568928863a9a8958d9e91edc54696609c34cd1f3c71fc0a48131e09 files/di
 MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r1 247
 RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r1 247
 SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r1 247
-MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r2 247
-RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r2 247
-SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r2 247
+MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r3 247
+RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r3 247
+SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE+rRwgo/w9rxVVVERAtamAJ0S0JPYZJdlVH4hQ98wzthPrQjSsgCeMY44
+IVmbEXwhXqr8Qs4jBC4sBAA=
+=HrfI
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r2 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r2
deleted file mode 100644
index 415a06809df0..000000000000
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2bdf0e10ee4e89c8975f313c5c0ba6f rss-glx_0.8.1.tar.bz2 5248755
-RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e rss-glx_0.8.1.tar.bz2 5248755
-SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb rss-glx_0.8.1.tar.bz2 5248755
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r2.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r2.ebuild
deleted file mode 100644
index 949a624266cc..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2006 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.8.1-r2.ebuild,v 1.2 2006/07/08 16:31:35 nelchael Exp $
-
-inherit flag-o-matic eutils
-
-MY_P=${PN}_${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Really Slick Screensavers using OpenGL for XScreenSaver"
-HOMEPAGE="http://rss-glx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="kde sse 3dnow openal xscreensaver"
-
-RDEPEND="|| ( x11-libs/libXt virtual/x11 )"
-DEPEND="${RDEPEND}
-	virtual/opengl
-	media-libs/glew
-	>=media-gfx/imagemagick-5.5.7
-	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}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-r1-gentoo.patch
-	epatch ${FILESDIR}/${PN}-0.8.1-hyperspace-viewport.patch
-	cp ${FILESDIR}/jwz-vroot.h ${S}/include/vroot.h
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	local myconf
-
-	myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \
-	myconf="${myconf} --with-configdir=/usr/share/xscreensaver/config/" \
-
-	if use kde; then
-		find . -name '*.desktop' -exec \
-			sed -i \
-				-e 's:Exec=kxsrun \(.*\):Exec=kxsrun \1:g' \
-				-e 's:Exec=kxsconfig \(.*\):Exec=kxsconfig \1:g' \
-				'{}' \
-			\; \
-			|| die "couldnt sed desktop files"
-		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 openal sound) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	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/lib/X11/app-defaults/XScreenSaver"
-
-	if [ -f ${XSCREENSAVER_CONF} ]; then
-		einfo "Adding Really Slick Screensavers to XScreenSaver"
-		sed -e '/*programs:/a\
-	GL:       \"Cyclone\"  cyclone --root     \\n\\\
-	GL:      \"Euphoria\"  euphoria --root    \\n\\\
-	GL:    \"Fieldlines\"  fieldlines --root  \\n\\\
-	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\\\
-	GL:    \"Solarwinds\"  solarwinds --root  \\n\\\
-	GL:     \"Colorfire\"  colorfire --root   \\n\\\
-	GL:   \"Hufos Smoke\"  hufo_smoke --root  \\n\\\
-	GL:  \"Hufos Tunnel\"  hufo_tunnel --root \\n\\\
-	GL:    \"Sundancer2\"  sundancer2 --root  \\n\\\
-	GL:          \"BioF\"  biof --root        \\n\\\
-	GL:    \"MatrixView\"  matrixview --root  \\n\\\
-	GL:   \"Spirographx\"  spirographx --root \\n\\\
-	GL:   \"BusySpheres\"  busyspheres --root \\n\\' \
-		-i ${XSCREENSAVER_CONF}
-
-	else
-		einfo "Unable to add these to XScreenSaver configuration"
-		einfo "This should not happen. Please file a bug"
-	fi
-}
-
-pkg_postrm() {
-	local XSCREENSAVER_CONF="${ROOT}/usr/lib/X11/app-defaults/XScreenSaver"
-
-	has_version x11-misc/rss-glx && return 0
-	if [ -f ${XSCREENSAVER_CONF} ]; then
-		einfo "Removing Really Slick Screensavers from XScreenSaver configuration."
-		sed \
-			-e '/\"Cyclone\"  cyclone/d' \
-			-e '/\"Euphoria\"  euphoria/d' \
-			-e '/\"Fieldlines\"  fieldlines/d' \
-			-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' \
-			-e '/\"Solarwinds\"  solarwinds/d' \
-			-e '/\"Colorfire\"  colorfire/d' \
-			-e '/\"Hufos Smoke\"  hufo_smoke/d' \
-			-e '/\"Hufos Tunnel\"  hufo_tunnel/d' \
-			-e '/\"Sundancer2\"  sundancer2/d' \
-			-e '/\"BioF\"  biof/d' \
-			-e '/\"MatrixView\"  matrixview/d' \
-			-e '/\"Spirographx\"  spirographx/d' \
-			-e '/\"BusySpheres\"  busyspheres/d' \
-			-i ${XSCREENSAVER_CONF}
-	fi
-}