Add epatch_user as provided by tetromino on bug #425070.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 12 insertions, 20 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 76f0b54af8b7..6841f49f7001 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.155 2012/07/04 23:21:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.156 2012/07/12 02:01:54 cardoe Exp $
+
+  11 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  gnome-screensaver-3.4.1.ebuild, gnome-screensaver-3.4.2.ebuild:
+  Add epatch_user as provided by tetromino on bug #425070.
 
 *gnome-screensaver-3.4.2 (04 Jul 2012)
 
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 9a2d969b850c..2c3b925f1d61 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoologo-floaters.desktop 414 SHA256 d8ae7a179c24167d70bb7712eda48807f10b09bce0f32b7f521af21654b641f9 SHA512 40b9b8d03d1eb0b6557c5020afc3262d894d99d62acab06a601c59b377646f107e4ffa19ff9a23321d17c4c463f7aea90c36d210a11ab5d9a9488a3ac080057c WHIRLPOOL dc5086e0bcc5ea30070bd1bb5ed7e2233762e518714e8b7d8cb5ba7c5a80bad9834995ba90a02f97403083eb8b543d34359917a24971760230bead19b5a18910
 AUX gnome-screensaver-2.30.2-libnotify-0.7.patch 708 SHA256 09bd31d89527e489b0b21e5cd4f432522205b573db57729a86046d7e85e53656 SHA512 a5b04f650f6216a050a87bfaba63e662de82a9af7d5a8f2a538b4a3de1058ca7e5b16178d9f463df2388a36c4e945d262edf0d8a56782420da9861985ac92aba WHIRLPOOL e6151badff1c4076e2871a85670c2c0f0055dca3efd7e605b744413e5c23772f9735eaa079186e125f630900a903c50889a6228c11ee66bb100f7b7c7dbe735a
 AUX gnome-screensaver-2.30.2-libxklavier-configure.patch 1058 SHA256 5049c105315841c034e96dd99c9410cefde0bcf827a6430b8c93318ddc2aadf0 SHA512 175608f15fd04d71799bbf3801141678841fa09c7c269b5c0bcd3dadcc9d6ef3df0a0251001442c1eafabaf6637ce65e366fe979449eb261dab0dd0e7a387e8a WHIRLPOOL d59a298280e5ac2852dd65e69db417a300557e3f7ec525f19f0870fea8ae8ae43acb98f686563a85d7402bfb0e938c1b3155df52e4d0fd6f9263fa8ee44af6e8
@@ -17,18 +14,7 @@ DIST gnome-screensaver-3.4.1.tar.xz 565540 SHA256 d54a253f826ff6cd48eba537243398
 DIST gnome-screensaver-3.4.2.tar.xz 566124 SHA256 17e6585e27019200dd059f9f9495427b64aded8efa51c71018fe66f9ba45df6d SHA512 205a778d7ef0e24086421ceef5ceb1ff4a46777fef7b00d3bef1aeedcadb064908f397bd79a9f096aad557925326fbe3b4f8233e4ae329a57241ebf8046381bd WHIRLPOOL d229ef81573d6f4c711242ba545b3d7a979725e181fe49657e0ee9c418535262bc3f293624407179e6a15e5a19e4f809c7a7c271a17ede7a58c2216d28a71eb5
 EBUILD gnome-screensaver-2.30.2-r1.ebuild 4409 SHA256 e26ae92027177cac3147d499e492a68066df3ace47dc1745652addb26392c37e SHA512 3b3b7fabf5f69dbb0bd94fb77f2ee5260ae9bd6dbb2d50efc52cd8a2652d4ca1b15f8cdc51eae29c85f4fcb232ef49813e491f46f9fc917652bf5344b2e1cad5 WHIRLPOOL ef2a26f571a6d417f739e4e877eff5db69ebf2a2369a33187d720d0bc534acaff9a56ac24eebb596238868e2dae172211caa67ba0bae73f975b82e4a3184ec8c
 EBUILD gnome-screensaver-3.2.2.ebuild 1849 SHA256 3231eb826f917f4ef805332091de6c8185faf2e41d7db601b26b9a45b78347b8 SHA512 afa0589e9eb2ead8a8b7576bbd26f25fa788d358e912dc74514f230dd49c997b6556c3d479816b6855ca673dc7756c65de6d40e6eddffb4b8a655372bf906201 WHIRLPOOL b8a5a0f8c5831694c6163c468f5b48315df6de656c503a11af93144905c3d623e683121a6356bdf311a6fe36c5a665e593d717a0ab30e8f574ffb682b352110b
-EBUILD gnome-screensaver-3.4.1.ebuild 1975 SHA256 451aea2622ba3bd444d2529ce41da28f5a8efa8026a2016f929d452e843dd3ea SHA512 e4956f55b8f83de2917ec3d22948b170b03bb471dd0df54d050193a5321f9b3ccc58967b0e96d94069c7519df9b5f5f560d4c7b822853cc290a2c91c3676e7bd WHIRLPOOL d52000e41532aed8fa190af47176da5c98ec884f9c56be599147bb634880dbf3c0764ffe2cb3ceccdab0e67498ef4d669a95d4b92e6a2884a67eaaa5bacf1ea4
-EBUILD gnome-screensaver-3.4.2.ebuild 1978 SHA256 560699f84230672689e6ffeae528fc98774ac751e22d01d555dfc627a1089dc9 SHA512 1ea3b1b0c15afc851055af4767795b0f0f84f2da09b6dc43af7a6b3f6cfd12dae1f7dbb631d08a463ca9a0222dd8bfd735e4a7ddb8940d764d40f1b97dd4c5d8 WHIRLPOOL 263a3c7322bbc8ba1b366973a4777863d99201fa3a44d2c15f0171c00e62bff68262fab79c3ed770786ddf4cc3f08ad68455bee0a8cf56420e3a80dfac0f7fdb
-MISC ChangeLog 26063 SHA256 802abb2da9477720963fe6d9846b57d213a3c314158b9e0e810ad19fbb58c48d SHA512 791e48737480fca64f50b6456b1e5c708a38a6d8e49533bc6ea21156cfe8b4fe883eeb508eeadde091a63db5edf23b02b82fe19447e72d9fa07d72b7683ef67b WHIRLPOOL 4d8934593da5b84d0ef9ad77aec2fb7132493dd570cd5d97b71d3d8915a7b0448711f21023bdad75f83af66125b359baea744bcfaff9f41adc755a8701369669
+EBUILD gnome-screensaver-3.4.1.ebuild 1988 SHA256 e3f54e593fe94d052c635248f534192e6baa787999c5e8ceb9d36996e653deb3 SHA512 72f02050070d8f4203fd68247b2aad8bf1501fdeb0b48adc629e3aa825d1b4008daa6a9bf7a72a0271863c4a58539209f58357f7f13733efe77769af4e4d7560 WHIRLPOOL 5574f351b4fc8a7a887c76ea0d4a36806557fc84b4e4616f6bb828a59b7561cc7c756312cb67c7fbd62ac1d454a807a6604ddd6a8e10f914834a51f40c90de15
+EBUILD gnome-screensaver-3.4.2.ebuild 1988 SHA256 c771f9157c16c488489b320feab86eeccca2da0e1f2a8de244d22defc722c27f SHA512 0410fd02c1ec093fcee23ee3d9ef73a11fd7f48a0a2c22b1325fc324419b4bca08ea3c1f4e93a9f7744af19330bc151a3123db1cb0e735516efc4b8c733e76bd WHIRLPOOL 20e53443a2ea44fc13c2a30100f6ee3f236163eaadfd5711a2f674f542307e82104dca5c70a552c1cb05e066d3732fad5e981b649b48f72bd848c82c7f5143c8
+MISC ChangeLog 26236 SHA256 eb88225ab3b610a69d77e67788c12da9c193b865dde75b788fc297981a09226e SHA512 b44202e9f3b3ad6cd427e9abb2578f629e94fc6347d01ded4cf77e6916f7d23f8fefdd57e3d7e6288fcba6278e07d71160127efd3c966188125a3f694b3fa3b3 WHIRLPOOL 475676a86516940837de6648b1c5d1fcbe18f999280ff09da64e436959193966cadea8b7e050188cb08a8e668043aad77d78e31c10795a82070f6b671d12b7c9
 MISC metadata.xml 461 SHA256 1f9263f2c172b8e33b62054a80f8809f3ce31fd9f648a4d326315b98f14dcc5b SHA512 db7da29c2c6910d0af3bc093a1ed71bc326964ab01ceae654e0647e2da4011c9a566b68c3898e9871bd3db26fc6814d70c45f180f24be987169bec5bf7a80b33 WHIRLPOOL ca57dba5a807a8decd21c3c39233a82cabb4d97df1476c790ab02f1ea32b6ae406b639dd732e9cb3e0ab6825f09e471d661c02f0950140c7f4e2f8e1b18d0ddc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJP9NAyAAoJEJ0WA1zPCt1hL4QH/24EmsS3/kdCi7EThwfsDd0u
-kMtSxHaodx+4jh9r+hzVjNsL4Ui2Ju6PwvsVTRe8P5TSdSaRxZ97+bv80v/9XOnW
-f37rxidfrCorO/+e9Wul9wepQJAJ6UPUSzN/JG/qUcdxltf/OYDm4HfeSEtMfl10
-pTcCtsCli/uuS78itxWwNi3qB5MaI82kXjjmb85uPLrCexUEAxO7wSeM3W6UgoYJ
-XWpaggcyAkLE9Qnye5oNBtWggUWS536u5juPXxoAlMx4IrCJCZwkMrzhWOI38CP4
-fnNi45vTUuhqZzbSMUfA1hU96JKwa+IlcU9uHkmQLn8+J/ApOTuhuwP7uEJ9Iqg=
-=7bla
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.ebuild
index c5e502742dec..54cceebd3060 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.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/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.ebuild,v 1.2 2012/05/05 06:25:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.1.ebuild,v 1.3 2012/07/12 02:01:54 cardoe Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -69,6 +69,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch_user
 	# Regenerate marshaling code for <glib-2.31 compat
 	rm -v src/gs-marshal.{c,h} || die
 	gnome2_src_prepare
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.ebuild
index e22db4f9909c..bd955faaa77e 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.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/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.ebuild,v 1.1 2012/07/04 23:21:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.4.2.ebuild,v 1.2 2012/07/12 02:01:54 cardoe Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -69,6 +69,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch_user
 	# Regenerate marshaling code for <glib-2.31 compat
 	rm -v src/gs-marshal.{c,h} || die
 	gnome2_src_prepare