Fix broken patch which caused autotools to be needlessly re-run.

Package-Manager: portage-2.1.3.5

4 files changed, 50 insertions, 52 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 247d3212e7de..6a41db536e82 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.58 2007/04/06 21:34:19 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.59 2007/08/16 02:36:31 vapier Exp $
+
+  16 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  files/rss-glx-0.8.1-r1-gentoo.patch, rss-glx-0.8.1-r4.ebuild:
+  Fix broken patch which caused autotools to be needlessly re-run.
 
   06 Apr 2007; Peter Weller <welp@gentoo.org> rss-glx-0.8.1-r4.ebuild:
   Stable on amd64 wrt bug 167688
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index c9ec423bd43a..2f555ce9e7d3 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
@@ -6,19 +9,19 @@ AUX rss-glx-0.8.1-hyperspace-viewport.patch 507 RMD160 40bf26af531f3dd1504da4c3a
 MD5 dd3cb1c8e9375024b1dd9cc2c8d9e285 files/rss-glx-0.8.1-hyperspace-viewport.patch 507
 RMD160 40bf26af531f3dd1504da4c3aa84ebad585df162 files/rss-glx-0.8.1-hyperspace-viewport.patch 507
 SHA256 3652e11e15cbe8262cb8cb65426e24cbd70751940feff7423a2c0be711dd8562 files/rss-glx-0.8.1-hyperspace-viewport.patch 507
-AUX rss-glx-0.8.1-r1-gentoo.patch 3102 RMD160 651afdc76112048a2491c557a3ed3821d55fdd72 SHA1 14e99ec7c3f91a331e7c4ead63881102faaf20e5 SHA256 02192c8ad644e567ee457c348d94ff4218240b8004cae2e34e6bd0201c4db593
-MD5 a7eba0c876574e935fa4645c61ce32be files/rss-glx-0.8.1-r1-gentoo.patch 3102
-RMD160 651afdc76112048a2491c557a3ed3821d55fdd72 files/rss-glx-0.8.1-r1-gentoo.patch 3102
-SHA256 02192c8ad644e567ee457c348d94ff4218240b8004cae2e34e6bd0201c4db593 files/rss-glx-0.8.1-r1-gentoo.patch 3102
+AUX rss-glx-0.8.1-r1-gentoo.patch 1778 RMD160 c50926bac73cf98a4b7dec217f616c2fa881c10b SHA1 4f91ba9479ba2350992c6a8d8dfc9b19970a778e SHA256 f26e780b5e7979b6c4eb97c78078e377ba6c96e46c1c9b194af9064d8c65a9ec
+MD5 44ed9e70e8ee0b5255a0ae3def891c75 files/rss-glx-0.8.1-r1-gentoo.patch 1778
+RMD160 c50926bac73cf98a4b7dec217f616c2fa881c10b files/rss-glx-0.8.1-r1-gentoo.patch 1778
+SHA256 f26e780b5e7979b6c4eb97c78078e377ba6c96e46c1c9b194af9064d8c65a9ec files/rss-glx-0.8.1-r1-gentoo.patch 1778
 DIST rss-glx_0.8.1.tar.bz2 5248755 RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e SHA1 188871d7940de8a7c3f9e622ddc131e46567eab5 SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb
-EBUILD rss-glx-0.8.1-r4.ebuild 4652 RMD160 b96d2a6bf890fa34088902d67dbc86c54205cc69 SHA1 82baca9ef689a18878db0975fa13f1a0ddbcd9c9 SHA256 834b622f13bc253ca38387fed75945055371a5718da0bd11c949afcae62ce2a9
-MD5 a2813280c3b104a58567eeb466862a30 rss-glx-0.8.1-r4.ebuild 4652
-RMD160 b96d2a6bf890fa34088902d67dbc86c54205cc69 rss-glx-0.8.1-r4.ebuild 4652
-SHA256 834b622f13bc253ca38387fed75945055371a5718da0bd11c949afcae62ce2a9 rss-glx-0.8.1-r4.ebuild 4652
-MISC ChangeLog 9727 RMD160 2bf8e6cdda4183b2a3c1e18930e70499a3eef178 SHA1 f48b8e5cd28f9fc1fb81b10779dfcfd4fd689f87 SHA256 2760f02f90815826cebe912c356ca84c077198f49be114c34a96cfb2f4153f8f
-MD5 9b83817321cb22715060172f1074ec7c ChangeLog 9727
-RMD160 2bf8e6cdda4183b2a3c1e18930e70499a3eef178 ChangeLog 9727
-SHA256 2760f02f90815826cebe912c356ca84c077198f49be114c34a96cfb2f4153f8f ChangeLog 9727
+EBUILD rss-glx-0.8.1-r4.ebuild 4643 RMD160 1885b9672318c4332aefe8de13853240062330a1 SHA1 64a4bf3b6dbda06530ee91a7ff8b9ef74a6bf8d6 SHA256 63329aafb8032cc4f3c48da633a6ec1914793f1fe389afd5fc10a566ec7ae1a7
+MD5 b0b7a00e183a0c5acc6be46a50bc9daf rss-glx-0.8.1-r4.ebuild 4643
+RMD160 1885b9672318c4332aefe8de13853240062330a1 rss-glx-0.8.1-r4.ebuild 4643
+SHA256 63329aafb8032cc4f3c48da633a6ec1914793f1fe389afd5fc10a566ec7ae1a7 rss-glx-0.8.1-r4.ebuild 4643
+MISC ChangeLog 9911 RMD160 c8f7dca1d3b1901c1b289f548d969af87e605b73 SHA1 692a55ee9e68328551b144c123595efba5897d25 SHA256 a752e6272ef952adc560d6d46a9a8a69edda9a84fdd0334caf5cab94ad887bfb
+MD5 c2d335a3d00b089a9e89085e8d12ad26 ChangeLog 9911
+RMD160 c8f7dca1d3b1901c1b289f548d969af87e605b73 ChangeLog 9911
+SHA256 a752e6272ef952adc560d6d46a9a8a69edda9a84fdd0334caf5cab94ad887bfb ChangeLog 9911
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -26,3 +29,10 @@ SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata
 MD5 bd54653bfe4eecf0c187a2c2c49fe0ec files/digest-rss-glx-0.8.1-r4 247
 RMD160 3096c08f814aebf19bd75bb6c8aeb9996d03fd8c files/digest-rss-glx-0.8.1-r4 247
 SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/digest-rss-glx-0.8.1-r4 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGw7hZp/wUKkr7RBoRAvbdAJ9mmHDeE4rt3IV+j4Dnvch0QoBhiQCg2iWe
+ccP++2ft8FOWemxl6Vh0yMY=
+=wpHJ
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch
index 22a42fd1cbe2..dfc3012aacdc 100644
--- a/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch
@@ -1,36 +1,23 @@
-diff -Nru rss-glx_0.8.1.vanilla/configure.in rss-glx_0.8.1/configure.in
---- rss-glx_0.8.1.vanilla/configure.in	2006-07-03 11:52:22.000000000 +0200
-+++ rss-glx_0.8.1/configure.in	2006-07-03 11:52:39.000000000 +0200
-@@ -7,14 +7,12 @@
- AC_PROG_AWK
+--- rss-glx_0.8.1/configure
++++ rss-glx_0.8.1/configure
+@@ -3099,7 +3099,6 @@
+ fi
  
- AC_PROG_CC
--CFLAGS=-g
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=yes])],
-     [test "$enableval" = "no" && CFLAGS="-O2"])
- CFLAGS="$CFLAGS -Wall"
  
- AC_PROG_CXX
--CXXFLAGS=-g
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
-     [build with debugging information default=yes])],
-     [test "$enableval" = "no" && CXXFLAGS="-O2"])
-diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.am rss-glx_0.8.1/reallyslick/cpp_src/Makefile.am
---- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.am	2006-07-03 11:52:22.000000000 +0200
-+++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.am	2006-07-03 11:54:30.000000000 +0200
-@@ -19,7 +19,7 @@
- dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml
- endif
+-CFLAGS=-g
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+@@ -3567,7 +3566,6 @@
+ fi
  
--if INSTALL_XSCREENSAVER_CONFIG_FILES
-+if INSTALL_KDE_CONFIG_FILES
- dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
- endif
  
-diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.in rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in
---- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.in	2006-07-03 11:52:22.000000000 +0200
-+++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in	2006-07-03 11:53:59.000000000 +0200
+-CXXFLAGS=-g
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+--- rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in
++++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in
 @@ -281,7 +281,7 @@
  skyrocket_SOURCES = driver.cpp skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
  solarwinds_SOURCES = driver.cpp solarwinds.cpp rsDefines.h rsRand.h
@@ -40,9 +27,8 @@ diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.in rss-glx_0.8.1/re
  man_MANS = cyclone.1 fieldlines.1 flocks.1 flux.1 helios.1 plasma.1 skyrocket.1 solarwinds.1
  EXTRA_DIST = $(man_MANS)
  stringify_LDADD = @BZIP2@
-diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp
---- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp	2006-07-03 11:52:22.000000000 +0200
-+++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp	2006-07-03 11:52:39.000000000 +0200
+--- rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp
++++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp
 @@ -23,6 +23,7 @@
  #include <GL/gl.h>
  #include <GL/glu.h>
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
index cb4ef5343128..526c33a93de1 100644
--- a/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r4.ebuild,v 1.6 2007/04/06 21:34:19 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild,v 1.7 2007/08/16 02:36:31 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -40,15 +40,13 @@ pkg_setup() {
 
 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
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-r1-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-0.8.1-hyperspace-viewport.patch
+	cp "${FILESDIR}"/jwz-vroot.h include/vroot.h || die
 }
 
 src_compile() {
-	filter-flags -fPIC
-
 	local myconf
 
 	myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \