Version bump wrt #212060, thanks to Tobias Klausmann for reporting.

Package-Manager: portage-2.1.4.4

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 35ceab9e694508f981253196497ab3e4db649a2c..75548186ac2671c0bc0d901d7259c66e8148c382 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.222 2008/02/28 15:54:29 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.223 2008/03/02 14:45:27 drac Exp $
+
+*xscreensaver-5.05 (02 Mar 2008)
+
+  02 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.05-desktop-entry.patch,
+  +files/xscreensaver-5.05-posix-head.patch, -xscreensaver-5.04.ebuild,
+  +xscreensaver-5.05.ebuild:
+  Version bump wrt #212060, thanks to Tobias Klausmann for reporting.
 
   28 Feb 2008; Samuli Suominen <drac@gentoo.org>
   xscreensaver-5.04-r1.ebuild:

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index fdf40143b7643b73bbe900a3e6dd9695b7695aae..0346b95f49e10f517e7d6b528dd25b24d8ae9a83 100644 (file)
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -5,10 +5,13 @@ AUX xscreensaver-5.04-build.patch 1199 RMD160 f6a4e16513168daa57241f0fe09459710b
 AUX xscreensaver-5.04-desktop-entry.patch 1822 RMD160 9150f517f5ed6e55788af838e0296b357384d1b2 SHA1 ba39458f6e94e14723ffb695bae1d351d26fdf60 SHA256 233215ef5af94130697f5eb42dbb2147c0d774cae42ef4df6c3c4cf58e45bbe5
 AUX xscreensaver-5.04-gentoo.patch 4806 RMD160 abc9b3e218d4a8a5618d1ab04d00a21d4633c847 SHA1 56ae0cd141d9ac0667974d4b6f9162e80f2f87e3 SHA256 fdf5396983d5905b1d6d3eefdd6eed981abc2567d6bae58141516a75ab708a08
 AUX xscreensaver-5.04-nsfw.patch 2068 RMD160 0a0a1081584b81c8beda6cd7d6bd89d0dc8da72c SHA1 a2768a4bef374c7d36bd285e65244877abef752a SHA256 bdd5a0363ec5f71886b3fc402749d9082ba4be4d1e7e05eeb81d5271b2cd1acd
+AUX xscreensaver-5.05-desktop-entry.patch 1637 RMD160 56c495902e34ff261e23dcb14d0132d8edf6f047 SHA1 1152f06ec000c18f6a090f8efadc7b90e03fadb9 SHA256 7bc40cef2f1f58b704d4a2654ce37056209b22e680c5e491e952da59a191d8be
+AUX xscreensaver-5.05-posix-head.patch 583 RMD160 f96101fa4608321d3a87d74fc121eb4ed89d6b12 SHA1 f0f43a1c695676c8e69f3d618a837c326b69bebe SHA256 079de8b274c2799b7ab300b0a9f6b27f00ba50aa8a378ec68d62cfa624b3a746
 DIST xscreensaver-5.03.tar.gz 5412089 RMD160 f28aca829982c9b9b1989f03309e48fdbdc8e2de SHA1 e283a52faf6148273a82a9e5c9ed70c5722cdcb8 SHA256 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26
 DIST xscreensaver-5.04.tar.gz 5438905 RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 SHA1 1733ba7ee46b758453ef9ded0fc4ee084b7420a9 SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7
+DIST xscreensaver-5.05.tar.gz 5468293 RMD160 8f174d544ae68f54454d946c854cf81749427afb SHA1 6f23422b17dd8a06cdaf419fd16d398eee50601b SHA256 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a
 EBUILD xscreensaver-5.03.ebuild 4475 RMD160 72bfbe6fd349d3d35af9ce7d1501dff553a56187 SHA1 8b623c40d88d037f7aad8c9e36a5850f46b3200d SHA256 f7279fa3d14a512710a653bcdabc27258eeaff267b3cf2d1f8916e0e6b0c91dd
 EBUILD xscreensaver-5.04-r1.ebuild 2674 RMD160 aa23dab7de3e2cd8c2de5218fc020ef4193bb09d SHA1 4763c0cc261d3fd102d171cecf60ee9a1e8d09de SHA256 db4840aba75b987bd0490d8cd93f6dcef3d7992ebc04edabd3a7038332e147f5
-EBUILD xscreensaver-5.04.ebuild 2728 RMD160 23cc6e74f9e7246bbec654a3ef0182d2843d3441 SHA1 15a2a8133531ef8a8a00e240d5b94e1ae4417254 SHA256 18192827d1d04ce16a74860bd69cb00b73611e9799bdd901ba11b9c4f55e2cde
-MISC ChangeLog 36078 RMD160 afc9c7c88c9c91b4eda19ed064bff0eb6f9bddff SHA1 a67e3f4e75aeb440edb7611feb6bd9ba46f5e6ae SHA256 3dd87ee56a48ee858e9bb9b179d2adee527b2e7275b34a4d4acde95edeafc9a7
+EBUILD xscreensaver-5.05.ebuild 2630 RMD160 00644137cf38bc9cd704062a16088ab96240b5a9 SHA1 b361756de724de0a440a5388c7c67f857892ba34 SHA256 662cdaf320c691da0160728be6746b33fa88f6203f611081ed2255767c54cd67
+MISC ChangeLog 36381 RMD160 83807a00788a437ba41a21129bcba03699716919 SHA1 10a7751492e0f90b80c7f971f86afd7b2fc885ab SHA256 1d9c5d2cdaf1857691c51ead39f54c89c5f597c66bc7dd99b77f1d6d9eb1bcb7
 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
new file mode 100644 (file)
index 0000000..f0e9b90
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
@@ -0,0 +1,29 @@
+diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in
+--- xscreensaver-5.05.orig/driver/Makefile.in  2008-03-02 07:34:46.000000000 +0200
++++ xscreensaver-5.05/driver/Makefile.in       2008-03-02 16:07:29.000000000 +0200
+@@ -498,7 +498,7 @@
+            echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"           ;\
+                 $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"           ;\
+          fi                                                                ;\
+-         name2=gnome-screensaver-properties.desktop                        ;\
++         name2=xscreensaver-properties.desktop                             ;\
+          echo $(INSTALL_DATA) screensaver-properties.desktop                \
+                 $(install_prefix)$(GTK_APPDIR)/$$name2                     ;\
+               $(INSTALL_DATA) screensaver-properties.desktop                \
+@@ -571,7 +571,7 @@
+ # into /usr/share/applications/
+ uninstall-gnome::
+       @if [ "$(GTK_DATADIR)" != "" ]; then                                  \
+-          f=gnome-screensaver-properties.desktop                             ;\
++          f=xscreensaver-properties.desktop                             ;\
+           echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
+                rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
+         fi
+diff -ur xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in    2008-01-27 01:16:59.000000000 +0200
++++ xscreensaver-5.05/driver/screensaver-properties.desktop.in 2008-03-02 16:08:00.000000000 +0200
+@@ -6,3 +6,4 @@
+ _Comment=Change screensaver properties
+ Type=Application
+ Categories=Settings;DesktopSettings;Security;
++NotShowIn=GNOME;

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
new file mode 100644 (file)
index 0000000..d282e78
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
@@ -0,0 +1,12 @@
+diff -ur xscreensaver-5.05.orig/Makefile.in xscreensaver-5.05/Makefile.in
+--- xscreensaver-5.05.orig/Makefile.in 2008-03-01 06:32:52.000000000 +0200
++++ xscreensaver-5.05/Makefile.in      2008-03-02 16:27:25.000000000 +0200
+@@ -326,7 +326,7 @@
+   diff -U0 download.html $$TMP ;                                          \
+   echo '' ;                                                               \
+                                                                           \
+-  OLDEST=`ls xscreensaver*.tar.gz | head -1` ;                                    \
++  OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ;                          \
+   /bin/echo -n "Delete $$DEST/$$OLDEST? ";                                \
+   read line;                                                              \
+   if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then                     \

diff --git a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
similarity index 71%
rename from x11-misc/xscreensaver/xscreensaver-5.04.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.05.ebuild
index e3d8bec830f79bbc16ea59ddc4d7bf1546be72c3..9d1f378cc332337e618893a726cc69438dda8b8e 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild,v 1.9 2008/02/07 15:05:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.1 2008/03/02 14:45:27 drac Exp $
 
-inherit autotools eutils fixheadtails flag-o-matic pam
+inherit eutils flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="jpeg new-login opengl pam suid xinerama"
 
 RDEPEND="x11-libs/libXxf86misc
@@ -35,26 +35,20 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig
        sys-devel/gettext
        dev-util/intltool
-       xinerama? ( x11-proto/xineramaproto )"
+       xinerama? ( x11-proto/xineramaproto )
+       !x11-misc/fireflies"
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-
-       # Gentoo specific hacks and settings.
-       epatch "${FILESDIR}"/${P}-gentoo.patch
-       epatch "${FILESDIR}"/${P}-nsfw.patch
-
+       epatch "${FILESDIR}"/${PN}-5.04-gentoo.patch
+       epatch "${FILESDIR}"/${PN}-5.04-nsfw.patch
        epatch "${FILESDIR}"/${P}-desktop-entry.patch
-
-       eautoreconf
-
-       # TODO. Get this fixed upstream.
-       ht_fix_all
+       epatch "${FILESDIR}"/${P}-posix-head.patch
 }
 
 src_compile() {
-       # Simple workaround for the flurry screensaver. Still needed for 5.04.
+       # Simple workaround for the ppc* arches flurry screensaver, needed for <=5.04
        filter-flags -mabi=altivec
        filter-flags -maltivec
        append-flags -U__VEC__
@@ -63,8 +57,8 @@ src_compile() {
 
        econf \
                --with-x-app-defaults=/usr/share/X11/app-defaults \
-               --with-hackdir=/usr/lib/misc/xscreensaver \
-               --with-configdir=/usr/share/xscreensaver/config \
+               --with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+               --with-configdir=/usr/share/${PN}/config \
                --x-libraries=/usr/$(get_libdir) \
                --x-includes=/usr/include \
                --with-dpms-ext \
@@ -94,12 +88,11 @@ src_install() {
 
        dodoc README*
 
-       use pam && fperms 755 /usr/bin/xscreensaver
-       pamd_mimic_system xscreensaver auth
+       use pam && fperms 755 /usr/bin/${PN}
+       pamd_mimic_system ${PN} auth
 
        # Bug 135549.
-       rm -f "${D}"/usr/share/xscreensaver/config/electricsheep.xml
-       rm -f "${D}"/usr/share/xscreensaver/config/fireflies.xml
+       rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
        dodir /usr/share/man/man6x
        mv "${D}"/usr/share/man/man6/worm.6 \
                "${D}"/usr/share/man/man6x/worm.6x