diff options
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 21 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch | 86 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.20.ebuild | 7 |
4 files changed, 110 insertions, 10 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 483b31dd8ac3..586c5d77090f 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.323 2012/11/14 17:13:09 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.324 2012/11/18 14:53:11 xarthisius Exp $ + + 18 Nov 2012; Kacper Kowalik <xarthisius@gentoo.org> + +files/xscreensaver-5.20-parallel-build.patch, xscreensaver-5.20.ebuild: + Fix parallel build wrt #259115 by Mr. Anderson <walch.martin@web.de> 14 Nov 2012; Andreas Schuerch <nativemad@gentoo.org> xscreensaver-5.20.ebuild: diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index b430e6795083..c12da74b2322 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -6,18 +6,29 @@ AUX xscreensaver-5.15-gentoo.patch 3002 SHA256 f81bde587499a82778fd396220eb4b4c8 AUX xscreensaver-5.20-blurb-hndl-test-passwd.patch 359 SHA256 24d7f49d51e6a6150ded1fc4a3918df2555cea11938e26b677d1b7eb31f01c54 SHA512 546d899c49ad84d4552becc8a2a3237d8a62eff8408fc3daa97067805474431cc0cea0dfc2c2315deb560dacb310c94d4b6cbd455d783643df05bf438cc21de8 WHIRLPOOL ab66956eca22c7309562ea72ae2727ef41edbb388aba821e7a8a74beac10870af27a43b779b30dcc39704ae450f7991cf7585468bedc74c143733158704865b0 AUX xscreensaver-5.20-check-largefile-support.patch 398 SHA256 b1cd3508a39d9ad0dce55aab3a373dd2c9e2e5146a1596894a6e4d12b3fdfa5d SHA512 da150af0c5874507966f6e386c6a9c35fed9e38169d8fa5e7d1a24bcf0473eab97c0206978157b863c45d415a6d5ba972ff04609c18cf0164fb4b1d29b1cc628 WHIRLPOOL 8c6842d13a8b3becd3bf685fa0bc598d5058a4c8abc2b956bee5196e981645017c6d029b9b1abeccc2b86f5a16b32d377905a2d1be2916defa36f2a67f12239e AUX xscreensaver-5.20-conf264.patch 645 SHA256 8a06d52396c579c2ff3704eecd3635dcee488de740aa1bdb6a677cf564b0bf0d SHA512 53765feea44e9044368b98db9c57eff390e1f51a4581d417da58ffa1571ea7b14ecaabf5bdaff15b6add15042d8d116ce64df5245211e11a45a72941ec3d0df5 WHIRLPOOL 538174704008dc9cc50a58addaa8e668930f19c3935a5faa2b2c7104f2c678cb76f8b7c93ad0c4280756838d4d474493c18573f1fe723b3232da7c2fda61f298 +AUX xscreensaver-5.20-parallel-build.patch 2794 SHA256 2235a8720b80f16420ec9d960970eb20af7b25f56817e8030cfc1bfe0a6926ae SHA512 1a92b7bd6a2d2dfa29ee87a713d0765ec8852f24950420c9a6458913228a01d6b23325bdc42f0be12fbba3bc92cb77eefbdafc56710aefd84f8a88eede676f64 WHIRLPOOL c669f816b3c7d3c49caca23e5b07ea35b3e1f9113f87128fa8bb1528ec553c26eebc59360b9587b1708249d2686406b25284b165df586b11e12c7aa13698d49d AUX xscreensaver-5.20-test-passwd-segv-tty.patch 412 SHA256 6abe35c0a28f7cb7aa9eca8f16d96130690b6fe20fdcf2dbf55ecd4da40ea8cb SHA512 5744b2669f3409cc690e7b3a7f365418e72cac0f7ba7496efbc41c3284ef9095531e1394a35740f8cdaff336d5fa0511690ab392352fc13acf9c0a259b4b843c WHIRLPOOL cea55d03b72c7dc35b901850cc490ad80073d2859ed3d1097c32c7a6a455fbcbaf1db032f9ffab55484c6780d49d48986d4a76e0e3a18abbf6ec855e595bc666 AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf696aec155681684ecb1498cb0bf09892e905ec3 SHA512 ad1bea7367d548b5b8600bcfc5399c575d467135a327d303ca88b7cdd8572767001c690a9644b0df099086f80b2c946a9b3d742c9f1030f1d710c500c08057a2 WHIRLPOOL df8684942655e66c49ab127580aa2324b785c80afb7c76625f7101621daeca593dba0624bb487af57f204395ab72e4dfde165f643ebf09d5c70d4998d404a42a DIST xscreensaver-5.15.tar.gz 5977594 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d SHA512 2013cf627908a3fa59a3e7d3e6e03b495497113828bf6c89d477fd84dca6867ddeafd572a5f23f12bbfd98fb32acbfc2bcb5d24ef4975c3c263439dbe6fa66b2 WHIRLPOOL 186719cc301ede656fd002f4eadafcec2fe488f60bc1323ca512cb0f49398dfcb3e08da4fd0e6028287438a24b92746a1972759a18b9f9e57bc9d61b5a50c852 DIST xscreensaver-5.20.tar.gz 7380256 SHA256 a9cf9f745c6319db175d7e1e36545b01b9e099a89fd5c239689c982e0c10bcb1 SHA512 2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 WHIRLPOOL e3ffbb2dfbfabfa669276c9e624f9a88dfd4808533dcaa7b57b12cbe16e3da83c8d1ab38a19a370f2309a1ed7d266666ace5c65ed9357707fb9850d4f4ab290d EBUILD xscreensaver-5.15.ebuild 3198 SHA256 890d133642f9d71ca9dfd2bf3203eaa813d3b9f90216d8e8858367cf165d8180 SHA512 3a5719e4475266ae6dc5d083a95ff52f24b51abfebcd00f207bd01482c41df15b494f54d97a4442f6919ff2e49cef9a5c31e741a5ff46a1d8db9e796ebbca8bf WHIRLPOOL 50039503a2f82e7b9a6a2b65bf7cfb64a2a6530543cd589b15ca253e53d421163bf8289cfaad7d44bdc91af1d372dbc8e1531c686dba12242cb23da1286c5fb4 -EBUILD xscreensaver-5.20.ebuild 3528 SHA256 b4e8698544ef61bd05c28376d252b857365f84b4c729cfffa9629e1bb4ce03f7 SHA512 1a6b70d164d68914d09e2b4acbcb7258cc6b4a4fdd38b96fd90c1016409c5556bb0b85e2e0118a6d56f0b278347f0a920286d5e36e3fe6170670da0a3670c7ec WHIRLPOOL b459e21e865ddde48b65ba40fc005006beddab840aba768393a136daddfd9fb9e4c440535de5f8dec25de6ecd002b9f57400ba3cfad1374bcccbb17129864583 -MISC ChangeLog 51943 SHA256 71d2779873b4c50a26449bcc0ba36cb7c7c77b8764f91d58c1f543228bde3227 SHA512 867479c9f7612e7dce70947ccc9cf4ed75c0a7f193e8ae31e5176de4f244f24893a5b9d417bb5e8f9748bd4dcb13559ca304f2a2870d11a7f433d9a0e97c0bff WHIRLPOOL 0558b81ebbb8d77ab5879649b54c2e3b7a4b3daadf711d181260516a8f1e9fda9127baad06c027557c548fed45635b1dc7d8c09597a97932cf53a334f1f284d6 +EBUILD xscreensaver-5.20.ebuild 3551 SHA256 448125c00c9e47b6911d53558d3222731c18839025852e542370c070472fc17f SHA512 85d6f9d0d6ab085a39ecb59704db5af6400bda2504cd8c1e2391c6fda6b261999c45fcda3da8850ccfe8fea96ef98f7ac3364805251851a90e3933afffaf1269 WHIRLPOOL 60018bdaa6a8d4b46e1c2be9157ebe9ea6c62996a7c31ea6c817b61c71a1a3abe5869ca847d93d550de1403a5b9e1a4475105865f7b884bd1c63a133ba57177c +MISC ChangeLog 52145 SHA256 594c5af69f05b616800fd3daff6004d3951d9bee714c9a032c09227d75fb94e9 SHA512 6027a9277b4da1cc9f49b36e0b41d7010728f227dd98a43552e83e3c8cb7cabffd71594f6d0836506669789fb786675b197f8970a2e57b3bea2844a6cb954431 WHIRLPOOL 92f6404dffcd70927bc31c4006b411d2130268c8a4798d370e8fdf18d5d4f12b74b753eaaaaf4f787b6e2788a35670464297103089023aa9698a1e6f6fb97c3d MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCkQBwACgkQakKUmsHeVLLRjwCcDKpmWk1xi+Jdw4K6vc8BkbrS -oGcAnjv6yTzMTmp2DZqIG31FCOZIqkv/ -=3Q8z +iQIcBAEBCAAGBQJQqPZZAAoJEF0huFKJUZL5OloP/0BAujuWTs3kTLM0z36aHCi2 +vJEV08AmkcyT4RZo4aDN8pSU4DHh/Bbk2EOqtQNuScszKVkPlJOcekS3+S/30iur +hBiAtEYaQM1Tmwb5LkxstclvPzJTb0p/g4eYyF0Nz9DgodsMZpi/hOtRth7Wdo6w +pizsjG7eaGUp/0Dhn9A5cwD/q1sotD8Uhw+DiK5SLlSvSQHX31idMbjbiWE0FCJ6 +18Eh7+iqg0agvJLy5Wkpu6DhXnslHsSW0oAQiUuDvzh4GIjgEgBI0YnhmEAqdwdd +x/U1hfK3vIuHpmdlutVQIf6KNcezxuatylbgL8EcRNPdL/1sYZ3QIhMCd4/GVqz0 +W7LRqwjsQ7kY/69ZITcXkpdPlkHx01FpCk0vZ21w8gvLHain0lYdzhzfrew9rRJl +IWGzF9ExwBsRXtNGrMMZviyOG2E2isXDR+1EJqBOT69hz7CuKkhAlIIr/6j8qmVx +leP8sIBUKGj0kkMwnmULGIbwipTL/qn9vpimgywBRxHUxnxRHBzTNwhUogULB+w0 +nc42iAHSZIzx04QIxyZnBAYHxP+coxhHJb21KRffX/SVOeCcH/rnwyGCp8OCDF9n +c+7uhOuMUaMcoQGorrY7vinRlqNYDGmGHe3DAFX5nRDzD8EXtWppvqcBry6kq+ki +4/2y8bLKZxi/fdmtHlrB +=M3X+ -----END PGP SIGNATURE----- diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch new file mode 100644 index 000000000000..f28d663b8465 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-parallel-build.patch @@ -0,0 +1,86 @@ +Fix make[1]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule + +https://bugs.gentoo.org/show_bug.cgi?id=259115 + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> +--- a/Makefile.in ++++ b/Makefile.in +@@ -19,8 +19,8 @@ TARFILES = README README.hacking README.VMS INSTALL \ + + TAR = tar + +-MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done +-MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done ++MAKE_SUBDIR = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done ++MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done + + default:: + @$(MAKE_SUBDIR) +@@ -45,7 +45,7 @@ depend:: + distdepend:: + @$(MAKE) update_spec_version + @$(MAKE_SUBDIR2) +- @cd po ; $(MAKE) update-po ++ @$(MAKE) -C po update-po + + TAGS:: tags + tags:: +@@ -284,7 +284,7 @@ test-tar:: + chmod -R u+w . + + dmg:: +- cd OSX ; $(MAKE) release dmg ++ $(MAKE) -C OSX release dmg + + www:: + @ \ +@@ -349,8 +349,7 @@ www:: + cat $$TMP > download.html ; \ + rm -f $$TMP ; \ + \ +- (cd ..; $(MAKE) xscreensaver/changelog.html \ +- xscreensaver/screenshots/index.html ); \ ++ $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \ + cvs diff -U0 changelog.html ; \ + set +x ; \ + \ +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -732,8 +732,7 @@ $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c + $(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c + + $(SAVER_UTIL_OBJS): +- cd $(UTILS_BIN) ; \ +- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ++ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + + # How we build object files in this directory. + .c.o: +--- a/hacks/Makefile.in ++++ b/hacks/Makefile.in +@@ -517,8 +517,7 @@ $(UTILS_BIN)/xdbe.o: $(UTILS_SRC)/xdbe.c + $(UTILS_BIN)/textclient.o: $(UTILS_SRC)/textclient.c + + $(UTIL_OBJS): +- cd $(UTILS_BIN) ; \ +- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ++ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + + # How we build object files in this directory. + .c.o: +--- a/hacks/glx/Makefile.in ++++ b/hacks/glx/Makefile.in +@@ -464,11 +464,10 @@ $(UTILS_BIN)/xshm.o: $(UTILS_SRC)/xshm.c + $(UTILS_BIN)/textclient.o: $(UTILS_SRC)/textclient.c + + $(UTIL_OBJS): +- cd $(UTILS_BIN) ; \ +- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ++ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + + $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c +- cd $(HACK_BIN) ; $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" ++ $(MAKE) -C $(HACK_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" + + + # How we build object files in this directory. diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild index 4da89fd6ba87..3d662f64c9b3 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.7 2012/11/14 17:13:09 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.8 2012/11/18 14:53:11 xarthisius Exp $ EAPI=4 inherit autotools eutils flag-o-matic multilib pam @@ -58,8 +58,6 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="gdm? ( new-login )" -MAKEOPTS="${MAKEOPTS} -j1" - src_prepare() { if use new-login && ! use gdm; then #392967 sed -i \ @@ -74,7 +72,8 @@ src_prepare() { "${FILESDIR}"/${PN}-5.20-check-largefile-support.patch \ "${FILESDIR}"/${PN}-5.20-conf264.patch \ "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ - "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch + "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ + "${FILESDIR}"/${PN}-5.20-parallel-build.patch eautoconf eautoheader |