From 635f86ff04120185b2b162b115e3cab5d22ebf54 Mon Sep 17 00:00:00 2001 From: Piotr Jaroszyński Date: Tue, 1 Jan 2008 18:53:28 +0000 Subject: Use new eselect-news for 0.26.0_alpha4 and the old one for the rest. (Portage version: 2.1.4_rc14) --- sys-apps/paludis/ChangeLog | 10 ++++++-- .../files/paludis-0.26.0_alpha4-news_test.patch | 30 ++++++++++++++++++++++ sys-apps/paludis/paludis-0.24.5.ebuild | 6 ++--- sys-apps/paludis/paludis-0.24.6.ebuild | 6 ++--- sys-apps/paludis/paludis-0.26.0_alpha3.ebuild | 6 ++--- sys-apps/paludis/paludis-0.26.0_alpha4.ebuild | 11 ++++++-- 6 files changed, 56 insertions(+), 13 deletions(-) (limited to 'sys-apps/paludis') 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 + 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 files/paludis-0.26.0_alpha4-news_test.patch, paludis-0.26.0_alpha4.ebuild: 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 +