Fix news patch and eselect-news dep.

Package-Manager: portage-2.1.4_rc11

4 files changed, 23 insertions, 32 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 6bc68f3f0833..869cc574b489 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.73 2007/12/13 20:42:34 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.74 2007/12/30 18:13:45 peper Exp $
+
+  30 Dec 2007; Piotr Jaroszyński <peper@gentoo.org>
+  files/paludis-0.26.0_alpha4-news_test.patch, paludis-0.26.0_alpha4.ebuild:
+  Fix news patch and eselect-news dep.
 
   13 Dec 2007; Piotr Jaroszyński <peper@gentoo.org>
   files/paludis-0.26.0_alpha4-news_test.patch:
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 0b6364262cd3..d0491e8a18c0 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -5,10 +5,10 @@ AUX paludis-0.20.0-dotfiles.patch 438 RMD160 340dac9b5cea826c4b92b5482f86652f063
 MD5 998ee2ca20d1ff8a2fef5adfc0d70910 files/paludis-0.20.0-dotfiles.patch 438
 RMD160 340dac9b5cea826c4b92b5482f86652f063d8ac4 files/paludis-0.20.0-dotfiles.patch 438
 SHA256 5163a2966a946dc431d3ad59d6af72cd1f2660fc150afa94c103d2c575fdfc73 files/paludis-0.20.0-dotfiles.patch 438
-AUX paludis-0.26.0_alpha4-news_test.patch 1275 RMD160 e8ed6fde73b5caaaa5a5924b684c3179cd5442ff SHA1 aede4aba18e8e62170bdb469b6cd328a330d9cd4 SHA256 f5de9681792e180580014b704764b58a366e808db62df63db35b2f278033b770
-MD5 c9a6503da2a30d15eea8707cec9db23b files/paludis-0.26.0_alpha4-news_test.patch 1275
-RMD160 e8ed6fde73b5caaaa5a5924b684c3179cd5442ff files/paludis-0.26.0_alpha4-news_test.patch 1275
-SHA256 f5de9681792e180580014b704764b58a366e808db62df63db35b2f278033b770 files/paludis-0.26.0_alpha4-news_test.patch 1275
+AUX paludis-0.26.0_alpha4-news_test.patch 734 RMD160 5f3b1aa93ca5aae9c4186e059a574acd47c448b8 SHA1 e5cb5e57fb62226df864d5449eb9ce48319b778f SHA256 57db8242d90081f8bac9ebcd526753ca72ff552c10325d37c3d13a6cfaddc472
+MD5 81c510446d8b3b7cb1bb97c2f5139ddd files/paludis-0.26.0_alpha4-news_test.patch 734
+RMD160 5f3b1aa93ca5aae9c4186e059a574acd47c448b8 files/paludis-0.26.0_alpha4-news_test.patch 734
+SHA256 57db8242d90081f8bac9ebcd526753ca72ff552c10325d37c3d13a6cfaddc472 files/paludis-0.26.0_alpha4-news_test.patch 734
 DIST paludis-0.16.2.tar.bz2 1314288 RMD160 5930536b05e2324861f168d3ffc7201c5865082a SHA1 a1655b5ebc6caa6986868b7a9f0756b1a15fb1e6 SHA256 0bc8d051e593d1269e040b25760940b119d8e843ef6e66234a917c540ff26025
 DIST paludis-0.20.0.tar.bz2 1374604 RMD160 ec69ae0a1826f4e511efc7f23578421572ae3d36 SHA1 47125b810955928f92db34e34c9f8026180112af SHA256 9dcc15a8f6d1a9b26afbdfa51c42cf4a4b1d264af6615e239cf5c24c75010dde
 DIST paludis-0.20.1.tar.bz2 1374783 RMD160 5d34f9e793c0fc49db3396c144731f698a0f2f5f SHA1 fc278d150c2e74ebd01b51eba2dd0ca5f18277dd SHA256 95830dc2d532a84981398d49bff5930b84ecc9cada2672016fb5e14756e2ddf1
@@ -65,14 +65,14 @@ EBUILD paludis-0.26.0_alpha3.ebuild 3524 RMD160 ca6cfae1b0132e8fcf444cb91edd1237
 MD5 5ba6b85edd48a1b720334ece5198092d paludis-0.26.0_alpha3.ebuild 3524
 RMD160 ca6cfae1b0132e8fcf444cb91edd1237d16a7c3c paludis-0.26.0_alpha3.ebuild 3524
 SHA256 8543b1f3f2ad05a9c9f2172ee4e219fc4cd0efe6aa1c33d845bb122e3fe26a30 paludis-0.26.0_alpha3.ebuild 3524
-EBUILD paludis-0.26.0_alpha4.ebuild 4212 RMD160 c712ed5d1a90327780df9b3e7fa168e844fb9d80 SHA1 992cfdd49a75b3faf5e323b9d2ca16aace681e90 SHA256 d5e13f4384a51619823e5378290a666f53688e80138b92780715b7ede54d9131
-MD5 e66b2c94614dee53226e32fea240c848 paludis-0.26.0_alpha4.ebuild 4212
-RMD160 c712ed5d1a90327780df9b3e7fa168e844fb9d80 paludis-0.26.0_alpha4.ebuild 4212
-SHA256 d5e13f4384a51619823e5378290a666f53688e80138b92780715b7ede54d9131 paludis-0.26.0_alpha4.ebuild 4212
-MISC ChangeLog 10296 RMD160 fc1328df72c9a16d33363fceffa5657b24f24540 SHA1 e539e241b578070ef104338893e73f64ee20a6c2 SHA256 fa6f997cd26e726d172e7222b4e27d628e4c3839d30579b91f738424f7eb7aa3
-MD5 1bf61fffd42b824d1c14e511a2734924 ChangeLog 10296
-RMD160 fc1328df72c9a16d33363fceffa5657b24f24540 ChangeLog 10296
-SHA256 fa6f997cd26e726d172e7222b4e27d628e4c3839d30579b91f738424f7eb7aa3 ChangeLog 10296
+EBUILD paludis-0.26.0_alpha4.ebuild 4223 RMD160 64cfe146056da02dfecc6373ac94834bb2080e0f SHA1 a1aa719285f49449ae21a0a03c02c8c2f59087f2 SHA256 5617260b14661de377ad421f180141e35e5d03289eeb279b8bade9fe8fc5dd30
+MD5 5b77a34a930c8edf92f2f500203d7157 paludis-0.26.0_alpha4.ebuild 4223
+RMD160 64cfe146056da02dfecc6373ac94834bb2080e0f paludis-0.26.0_alpha4.ebuild 4223
+SHA256 5617260b14661de377ad421f180141e35e5d03289eeb279b8bade9fe8fc5dd30 paludis-0.26.0_alpha4.ebuild 4223
+MISC ChangeLog 10466 RMD160 cefcdd7a27a50ca5635261692a5cada1bcf7573d SHA1 bba7ec219d91137ef28b32ca27cf5305fba679d9 SHA256 ef6efd627fbd10f8e6fd3de6071c83f2802c82611d3b4538976ecf7118f04dfe
+MD5 c9ac6dcc3e7504f59412ab7bc789ed32 ChangeLog 10466
+RMD160 cefcdd7a27a50ca5635261692a5cada1bcf7573d ChangeLog 10466
+SHA256 ef6efd627fbd10f8e6fd3de6071c83f2802c82611d3b4538976ecf7118f04dfe ChangeLog 10466
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215
 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215
@@ -114,9 +114,9 @@ MD5 2b0131073106612b4bb4da73d00fe67d files/digest-paludis-0.26.0_alpha4 271
 RMD160 cfb022ede3171f3e1aaa49858cfaa30b69630d28 files/digest-paludis-0.26.0_alpha4 271
 SHA256 92cc71e8a1a78d41491c0fb0bddab52bc579505f63ddef417f6d2b3cb5944a23 files/digest-paludis-0.26.0_alpha4 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHYZk9ppoStNGKGywRAjaAAJ9CZwFAP4izQQz8cVMuTSjwd2oMSgCfU/jP
-WmkZ81zTRCwJd4fDgdeem98=
-=8CjH
+iEYEARECAAYFAkd3390ACgkQppoStNGKGyzjeACgr0r3q5EwY7CiV7UqoGNKYahW
+KSYAoKUnXaZthEWAJ8wx3euVegElv51K
+=padE
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha4-news_test.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha4-news_test.patch
index 66185b955cd6..4bc13a1f8a94 100644
--- a/sys-apps/paludis/files/paludis-0.26.0_alpha4-news_test.patch
+++ b/sys-apps/paludis/files/paludis-0.26.0_alpha4-news_test.patch
@@ -1,16 +1,3 @@
-diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
-index 5c46d22..a32565a 100644
---- a/hooks/Makefile.am.m4
-+++ b/hooks/Makefile.am.m4
-@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in Makefile.am
- CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda .keep
- SUBDIRS = . demos
- 
--installvarlibpaludisnewsdir = $(localstatedir)/paludis/news
-+installvarlibpaludisnewsdir = $(localstatedir)/gentoo/news
- 
- installhookcommonprogdir = $(libexecdir)/paludis/hooks/common
- installhookinstallallpostdir = $(libexecdir)/paludis/hooks/install_all_post
 diff --git a/hooks/news_TEST_setup.sh b/hooks/news_TEST_setup.sh
 index ceccb99..c895b1c 100755
 --- a/hooks/news_TEST_setup.sh
diff --git a/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild b/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild
index 5f584c92900b..88ebcf4dc620 100644
--- a/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild
+++ b/sys-apps/paludis/paludis-0.26.0_alpha4.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/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild,v 1.2 2007/12/10 19:39:13 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild,v 1.3 2007/12/30 18:13:45 peper Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.0.2
-	app-admin/eselect-news
+	>=app-admin/eselect-news-20071201
 	>=app-shells/bash-3
 	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
 	inquisitio? ( dev-libs/pcre++ )