#97245: fixed some kde bugs

Package-Manager: portage-2.0.51.22-r1

6 files changed, 71 insertions, 16 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index a178d9e65041..960385fb29a7 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.32 2005/06/25 16:40:23 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.33 2005/07/01 13:08:26 smithj Exp $
+
+*rss-glx-0.8.0-r2 (01 Jul 2005)
+
+  01 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/rss-glx-0.8.0-hyperspace-install-fix.patch,
+  +files/rss-glx-0.8.0-kdedesktop-r2.patch, -rss-glx-0.8.0-r1.ebuild,
+  +rss-glx-0.8.0-r2.ebuild:
+  #97245: fixed some kde bugs
 
 *rss-glx-0.8.0-r1 (25 Jun 2005)
 
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 139876bbfa41..6d2e195b4066 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 6a688fa0a67abe0f6168d4f950ea3e5a ChangeLog 6122
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 d455ab02ea8f01213b3bbabc80cec72b rss-glx-0.7.6-r1.ebuild 4490
 MD5 3881c6c924d1b00291fb9c15455fe0b9 rss-glx-0.7.6.ebuild 4046
 MD5 2b2bf7730af496e4eee5da98c390868d rss-glx-0.8.0.ebuild 4635
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 d37cf2a8b33927e7e4bd4167720bdf83 ChangeLog 5857
-MD5 c9bd51f1a08343044d47e7ec3cd5e83d rss-glx-0.8.0-r1.ebuild 4724
+MD5 5f3c0194dbd5ca004acf2c05db9a4468 rss-glx-0.8.0-r2.ebuild 4780
 MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6 67
 MD5 c569bd57d6615d7b3d0d66db78c86bb9 files/digest-rss-glx-0.7.6-r1 67
 MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0 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 9b4404f02157380acbe80165fb4b7bf2 files/rss-glx-0.8.0-kdedesktop.patch 854
 MD5 9ffedb9bb790a6ff0bb9b3e64c6c6675 files/rss-glx-0.8.0-configure.in.patch 642
-MD5 4dbe321921028a106a05564a14b2f814 files/jwz-vroot.h 6234
-MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r1 67
+MD5 9b4404f02157380acbe80165fb4b7bf2 files/rss-glx-0.8.0-kdedesktop.patch 854
+MD5 b50c007842cc6ee24f667e1755b2bb6c files/rss-glx-0.8.0-hyperspace-install-fix.patch 1574
+MD5 6c580284e5773f292a32a5a30fcf539a files/digest-rss-glx-0.8.0-r2 67
+MD5 643bf4d6986ea275bc5b21a5626657c2 files/rss-glx-0.8.0-r2-kdedesktop.patch 1413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCvYkyl5AvwDPiUowRAgCEAKCTO+OZfyObmuWyGYjAT7gQLixI9gCgiBW0
-ihedXaZnc4YQJFRzrZOgO58=
-=+orm
+iD8DBQFCxUCHl5AvwDPiUowRAlFPAKCkmC4DgaguLKht0ioF6Q96vPefjACeO/hy
+hIhHOqiGWK5ZqaeyWQP/p0M=
+=onmi
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r1 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r2
index 8ecb6e1faf3b..8ecb6e1faf3b 100644
--- a/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r1
+++ b/x11-misc/rss-glx/files/digest-rss-glx-0.8.0-r2
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.0-hyperspace-install-fix.patch b/x11-misc/rss-glx/files/rss-glx-0.8.0-hyperspace-install-fix.patch
new file mode 100644
index 000000000000..004004e5c1a8
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.0-hyperspace-install-fix.patch
@@ -0,0 +1,22 @@
+--- rss-glx_0.8.0/reallyslick/cpp_src/Makefile.in	2005/07/01 11:39:43	1.1
++++ rss-glx_0.8.0/reallyslick/cpp_src/Makefile.in	2005/07/01 11:40:19
+@@ -171,7 +171,7 @@ solarwinds_SOURCES = driver.cpp solarwin
+ 
+ @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_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
++@INSTALL_KDE_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.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
+ 
+--- rss-glx_0.8.0/reallyslick/cpp_src/Makefile.am	2005/07/01 11:39:44	1.1
++++ rss-glx_0.8.0/reallyslick/cpp_src/Makefile.am	2005/07/01 11:40:02
+@@ -20,7 +20,7 @@ dist_config_DATA = cyclone.xml fieldline
+ endif
+ 
+ if INSTALL_KDE_CONFIG_FILES
+-dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.xml plasma.desktop skyrocket.desktop solarwinds.desktop
++dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
+ endif
+ 
+ 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-r2-kdedesktop.patch b/x11-misc/rss-glx/files/rss-glx-0.8.0-r2-kdedesktop.patch
new file mode 100644
index 000000000000..b20867e82d4f
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.0-r2-kdedesktop.patch
@@ -0,0 +1,22 @@
+--- 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
+ 
+--- reallyslick/cpp_src/Makefile.am	2005/07/01 11:34:22	1.1
++++ reallyslick/cpp_src/Makefile.am	2005/07/01 11:35:02
+@@ -19,7 +19,7 @@ if INSTALL_XSCREENSAVER_CONFIG_FILES
+ dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml
+ endif
+ 
+-if INSTALL_XSCREENSAVER_CONFIG_FILES
++if INSTALL_KDE_CONFIG_FILES
+ dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.xml plasma.desktop skyrocket.desktop solarwinds.desktop
+ endif
+ 
diff --git a/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild
index 69a63230f002..0e297c841e00 100644
--- a/x11-misc/rss-glx/rss-glx-0.8.0-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.0-r2.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.8.0-r1.ebuild,v 1.1 2005/06/25 16:40:23 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.0-r2.ebuild,v 1.1 2005/07/01 13:08:26 smithj Exp $
 
 inherit flag-o-matic eutils
 
@@ -19,8 +19,8 @@ DEPEND="virtual/x11
 	virtual/opengl
 	>=media-gfx/imagemagick-5.5.7
 	kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) )
-	!kde? ( >=x11-misc/xscreensaver-4.22-r1 )
-	xscreensaver? ( >=x11-misc/xscreensaver-4.22-r1 )
+	!kde? ( >=x11-misc/xscreensaver-4.22-r2 )
+	xscreensaver? ( >=x11-misc/xscreensaver-4.22-r2 )
 	openal? ( media-libs/openal )"
 
 pkg_setup() {
@@ -39,9 +39,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.8.0-kdedesktop.patch
+	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
 }
 
@@ -51,7 +52,7 @@ src_compile() {
 	local myconf
 
 	myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \
-	myconf="${myconf} --with-configdir=/usr/share/control-center/screensavers/" \
+	myconf="${myconf} --with-configdir=/usr/share/xscreensaver/config/" \
 
 	if use kde; then
 		find . -name '*.desktop' -exec \
@@ -92,7 +93,7 @@ pkg_postinst() {
 	GL:        \"Flocks\"  flocks --root      \\n\\\
 	GL:          \"Flux\"  flux --root        \\n\\\
 	GL:        \"Helios\"  helios --root      \\n\\\
-	GL:    \"hyperspace\"  hyperspace --root  \\n\\\
+	GL:    \"Hyperspace\"  hyperspace --root  \\n\\\
 	GL:       \"Lattice\"  lattice --root     \\n\\\
 	GL:        \"Plasma\"  plasma --root      \\n\\\
 	GL:     \"Skyrocket\"  skyrocket --root   \\n\\\