diff options
| -rw-r--r-- | sys-apps/paludis/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-apps/paludis/Manifest | 54 | ||||
| -rw-r--r-- | sys-apps/paludis/files/paludis-0.26.0_alpha4-news_test.patch | 30 | ||||
| -rw-r--r-- | sys-apps/paludis/paludis-0.24.5.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/paludis/paludis-0.24.6.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/paludis/paludis-0.26.0_alpha3.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/paludis/paludis-0.26.0_alpha4.ebuild | 11 |
7 files changed, 83 insertions, 40 deletions
diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog index 869cc574b489..b1b772592b77 100644 --- a/sys-apps/paludis/ChangeLog +++ b/sys-apps/paludis/ChangeLog @@ -1,6 +1,12 @@ # 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.74 2007/12/30 18:13:45 peper Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.75 2008/01/01 18:53:27 peper Exp $ + + 01 Jan 2008; Piotr Jaroszyński <peper@gentoo.org> + files/paludis-0.26.0_alpha4-news_test.patch, paludis-0.24.5.ebuild, + paludis-0.24.6.ebuild, paludis-0.26.0_alpha3.ebuild, + paludis-0.26.0_alpha4.ebuild: + Use new eselect-news for 0.26.0_alpha4 and the old one for the rest. 30 Dec 2007; Piotr Jaroszyński <peper@gentoo.org> files/paludis-0.26.0_alpha4-news_test.patch, paludis-0.26.0_alpha4.ebuild: diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest index d0491e8a18c0..42d68d226cdf 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 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 +AUX paludis-0.26.0_alpha4-news_test.patch 2093 RMD160 8b9bcfacacf339806320b45146abaf65c0b82d1f SHA1 cb30e486f1066f05c4d6c5e33e81dc3ba6756392 SHA256 817bac01bfd325a113691bbb2d5c146dec4f7373754e951faa06240c2edf4762 +MD5 1c0369127d0ddb69292d45422bb936db files/paludis-0.26.0_alpha4-news_test.patch 2093 +RMD160 8b9bcfacacf339806320b45146abaf65c0b82d1f files/paludis-0.26.0_alpha4-news_test.patch 2093 +SHA256 817bac01bfd325a113691bbb2d5c146dec4f7373754e951faa06240c2edf4762 files/paludis-0.26.0_alpha4-news_test.patch 2093 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 @@ -53,26 +53,26 @@ EBUILD paludis-0.24.2.ebuild 3687 RMD160 b893965ffde2730d75483bfaf6a61d52d334daa MD5 1f7b496f3b565462113f50e9ceec447a paludis-0.24.2.ebuild 3687 RMD160 b893965ffde2730d75483bfaf6a61d52d334daa8 paludis-0.24.2.ebuild 3687 SHA256 4ba39b3dc167ee5c69ea49b90c3768a27ba2fc79c1827afeb173127f82c3f424 paludis-0.24.2.ebuild 3687 -EBUILD paludis-0.24.5.ebuild 3706 RMD160 6870003cfdf7e98023a61ebfb9aa6804dbb27bd0 SHA1 013d0cbef6bf472ccb3721ae517ea90c3c06b3e5 SHA256 c9dcb7d6f04a26eb26308dc5ec8784c67a3776c8cf04d604a4cdb6e859722570 -MD5 4304153fbbc7c17db1a3cefc256639c8 paludis-0.24.5.ebuild 3706 -RMD160 6870003cfdf7e98023a61ebfb9aa6804dbb27bd0 paludis-0.24.5.ebuild 3706 -SHA256 c9dcb7d6f04a26eb26308dc5ec8784c67a3776c8cf04d604a4cdb6e859722570 paludis-0.24.5.ebuild 3706 -EBUILD paludis-0.24.6.ebuild 3706 RMD160 e6902f9155c284dee589ab935a2e82e00dca155d SHA1 57be10e2c569eac46cd376362cc9d97bd1c8bf88 SHA256 e43ffab934e53a7e38f3e93e465bea1cb8de9b9ea9cb54c9cfdf8023a49f252e -MD5 88994c7129586ee54124a074c60a0b7c paludis-0.24.6.ebuild 3706 -RMD160 e6902f9155c284dee589ab935a2e82e00dca155d paludis-0.24.6.ebuild 3706 -SHA256 e43ffab934e53a7e38f3e93e465bea1cb8de9b9ea9cb54c9cfdf8023a49f252e paludis-0.24.6.ebuild 3706 -EBUILD paludis-0.26.0_alpha3.ebuild 3524 RMD160 ca6cfae1b0132e8fcf444cb91edd1237d16a7c3c SHA1 5ca09b7081aece03b64566e02e6b85d876da553a SHA256 8543b1f3f2ad05a9c9f2172ee4e219fc4cd0efe6aa1c33d845bb122e3fe26a30 -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 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 +EBUILD paludis-0.24.5.ebuild 3716 RMD160 73d58d8aece52252c68c3bb37ca62f1482d7926b SHA1 a20c1e4fb129b4904d1a6137a82ff207771015a4 SHA256 b828bdd4f4e13f7c21477b588a6c3f45809deefcb2e7189c0de9831c7f457904 +MD5 9d204e109aa0e9dac649e9cb79ec7c28 paludis-0.24.5.ebuild 3716 +RMD160 73d58d8aece52252c68c3bb37ca62f1482d7926b paludis-0.24.5.ebuild 3716 +SHA256 b828bdd4f4e13f7c21477b588a6c3f45809deefcb2e7189c0de9831c7f457904 paludis-0.24.5.ebuild 3716 +EBUILD paludis-0.24.6.ebuild 3716 RMD160 d1fe8e9f1704a1076411e54b28f488c8998e34b6 SHA1 f491185484d4332e6371b19fe7d6b76266adf76d SHA256 f1da42eeff953187725906b4b5ca83cdea6dc3f8e2f1223e5c9a180c6839eaac +MD5 78acbef62aebf0760766b09ef6fddae5 paludis-0.24.6.ebuild 3716 +RMD160 d1fe8e9f1704a1076411e54b28f488c8998e34b6 paludis-0.24.6.ebuild 3716 +SHA256 f1da42eeff953187725906b4b5ca83cdea6dc3f8e2f1223e5c9a180c6839eaac paludis-0.24.6.ebuild 3716 +EBUILD paludis-0.26.0_alpha3.ebuild 3534 RMD160 6bbc8d33d5bb2ba26bfec53603a1a9da353d11ca SHA1 377c5f7a695435525ea7026ac091632a2fd1aee0 SHA256 349a075bec715c68be6f2b8f979446d54e6faf51af717e51ac6d2a6800fe2b9d +MD5 6abaf351c43c0ddc52451cdd32c1c8a7 paludis-0.26.0_alpha3.ebuild 3534 +RMD160 6bbc8d33d5bb2ba26bfec53603a1a9da353d11ca paludis-0.26.0_alpha3.ebuild 3534 +SHA256 349a075bec715c68be6f2b8f979446d54e6faf51af717e51ac6d2a6800fe2b9d paludis-0.26.0_alpha3.ebuild 3534 +EBUILD paludis-0.26.0_alpha4.ebuild 4390 RMD160 fb7a5be9cf0964d240b5a2706dc85d668f21d39f SHA1 89b294f3a333dca1567cdf10d8e024743869c41a SHA256 1ce605225b298b880e1d793f64577023f471c324353cfc3b3fb255626c26eb26 +MD5 c1a7dddee111194e3708f74acf2cc296 paludis-0.26.0_alpha4.ebuild 4390 +RMD160 fb7a5be9cf0964d240b5a2706dc85d668f21d39f paludis-0.26.0_alpha4.ebuild 4390 +SHA256 1ce605225b298b880e1d793f64577023f471c324353cfc3b3fb255626c26eb26 paludis-0.26.0_alpha4.ebuild 4390 +MISC ChangeLog 10748 RMD160 22620250b0bcf6f0041b16992c0396a2b0dad1d8 SHA1 3f7bd2dfbec3c9a580e91dcb75b7d38d3adcf63d SHA256 f42295dffc78ad0a1de540120c7ce4a6b9f480133029587486aa8d7b920ad92e +MD5 00533d48c31eb0ff36b8c37545a2ac5c ChangeLog 10748 +RMD160 22620250b0bcf6f0041b16992c0396a2b0dad1d8 ChangeLog 10748 +SHA256 f42295dffc78ad0a1de540120c7ce4a6b9f480133029587486aa8d7b920ad92e ChangeLog 10748 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215 @@ -116,7 +116,7 @@ SHA256 92cc71e8a1a78d41491c0fb0bddab52bc579505f63ddef417f6d2b3cb5944a23 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAkd3390ACgkQppoStNGKGyzjeACgr0r3q5EwY7CiV7UqoGNKYahW -KSYAoKUnXaZthEWAJ8wx3euVegElv51K -=padE +iEYEARECAAYFAkd6jCsACgkQppoStNGKGywFIQCgxsUJOS+WBF+7bATIA6gxOPeI +BiYAn30saWGKCuofZfRxRS99KpLfiKIJ +=t++L -----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 4bc13a1f8a94..2d974721112d 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,3 +1,17 @@ +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 @@ -22,3 +36,19 @@ index ceccb99..c895b1c 100755 monkey END +diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc +index 9ebd737..6b25a74 100644 +--- a/paludis/repositories/e/e_repository_news.cc ++++ b/paludis/repositories/e/e_repository_news.cc +@@ -67,9 +67,9 @@ namespace paludis + environment(e), + e_repository(p), + params(k), +- skip_file(e->root() / "var" / "lib" / "paludis" / "news" / ++ skip_file(e->root() / "var" / "lib" / "gentoo" / "news" / + ("news-" + stringify(e_repository->name()) + ".skip")), +- unread_file(e->root() / "var" / "lib" / "paludis" / "news" / ++ unread_file(e->root() / "var" / "lib" / "gentoo" / "news" / + ("news-" + stringify(e_repository->name()) + ".unread")) + { + } diff --git a/sys-apps/paludis/paludis-0.24.5.ebuild b/sys-apps/paludis/paludis-0.24.5.ebuild index c2e61221c65e..5acdf5035c0f 100644 --- a/sys-apps/paludis/paludis-0.24.5.ebuild +++ b/sys-apps/paludis/paludis-0.24.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.24.5.ebuild,v 1.4 2007/07/25 18:01:36 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.24.5.ebuild,v 1.5 2008/01/01 18:53:27 peper Exp $ inherit bash-completion eutils flag-o-matic @@ -31,7 +31,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} >=app-admin/eselect-1.0.2 - app-admin/eselect-news + <app-admin/eselect-news-20071201 net-misc/wget net-misc/rsync sys-apps/sandbox" diff --git a/sys-apps/paludis/paludis-0.24.6.ebuild b/sys-apps/paludis/paludis-0.24.6.ebuild index 00f74c397e62..fca0d9f398f6 100644 --- a/sys-apps/paludis/paludis-0.24.6.ebuild +++ b/sys-apps/paludis/paludis-0.24.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.24.6.ebuild,v 1.1 2007/08/14 20:13:40 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.24.6.ebuild,v 1.2 2008/01/01 18:53:27 peper Exp $ inherit bash-completion eutils flag-o-matic @@ -16,7 +16,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++ ) diff --git a/sys-apps/paludis/paludis-0.26.0_alpha3.ebuild b/sys-apps/paludis/paludis-0.26.0_alpha3.ebuild index 81f7e581f554..375ffdd65bba 100644 --- a/sys-apps/paludis/paludis-0.26.0_alpha3.ebuild +++ b/sys-apps/paludis/paludis-0.26.0_alpha3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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_alpha3.ebuild,v 1.4 2007/11/08 23:07:44 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_alpha3.ebuild,v 1.5 2008/01/01 18:53:27 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++ ) diff --git a/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild b/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild index 88ebcf4dc620..984add7403b4 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 +# Copyright 1999-2008 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.3 2007/12/30 18:13:45 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_alpha4.ebuild,v 1.4 2008/01/01 18:53:27 peper Exp $ inherit bash-completion eutils flag-o-matic @@ -130,3 +130,10 @@ src_test() { emake check || die "Make check failed" } + +pkg_postinst() { + # Remove the symlink created by app-admin/eselect-news + if [[ -L "${ROOT}/var/lib/paludis/news" ]] ; then + rm "${ROOT}/var/lib/paludis/news" + fi +} |