Fix make.profile location, straight to stable

(Portage version: 2.1.11.31/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0xF6AD3240)

6 files changed, 31 insertions, 112 deletions

diff --git a/dev-perl/PortageXS/ChangeLog b/dev-perl/PortageXS/ChangeLog
index 01d7d10c0f00..3f4c8e8bd466 100644
--- a/dev-perl/PortageXS/ChangeLog
+++ b/dev-perl/PortageXS/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/PortageXS
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/ChangeLog,v 1.55 2012/12/30 15:32:08 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/ChangeLog,v 1.56 2013/01/03 08:46:32 armin76 Exp $
+
+*PortageXS-0.02.10-r3 (03 Jan 2013)
+
+  03 Jan 2013; Raúl Porcel <armin76@gentoo.org> -PortageXS-0.02.09.ebuild,
+  -PortageXS-0.02.10-r1.ebuild, -PortageXS-0.02.10-r2.ebuild,
+  +PortageXS-0.02.10-r3.ebuild, files/PortageXS-0.02.10-portage_path_fix.patch,
+  files/PortageXS-0.02.10-prefix.patch:
+  Fix make.profile location, straight to stable
 
   30 Dec 2012; Raúl Porcel <armin76@gentoo.org> PortageXS-0.02.10-r2.ebuild:
   sh stable wrt #437414
diff --git a/dev-perl/PortageXS/PortageXS-0.02.09.ebuild b/dev-perl/PortageXS/PortageXS-0.02.09.ebuild
deleted file mode 100644
index d0900f788e5a..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.02.09.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.09.ebuild,v 1.6 2010/04/02 12:33:24 armin76 Exp $
-
-inherit perl-module
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sh sparc x86 ~x86-fbsd"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? ( dev-perl/IO-Socket-SSL
-				virtual/perl-Sys-Syslog )"
-
-src_unpack() {
-	unpack ${A}
-	if use minimal ; then
-		rm -r "${S}"/usr
-		rm -r "${S}"/etc/init.d
-		rm -r "${S}"/etc/pxs/certs
-		rm "${S}"/etc/pxs/portagexsd.conf
-		rm -r "${S}"/lib/PortageXS/examples
-	fi
-}
-
-pkg_preinst() {
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}"
-	fi
-	cp -r "${S}"/etc "${D}"
-}
-
-pkg_postinst() {
-	if [ -d /etc/portagexs ]; then
-		elog "/etc/portagexs has been moved to /etc/pxs for convenience. It is safe"
-		elog "to delete old /etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r1.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r1.ebuild
deleted file mode 100644
index 32be8ba5b42b..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r1.ebuild,v 1.3 2011/01/18 22:20:29 xarthisius Exp $
-
-inherit perl-module eutils prefix
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? ( dev-perl/IO-Socket-SSL
-				virtual/perl-Sys-Syslog )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.02.09-prefix.patch
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr
-		rm -r "${S}"/etc/init.d
-		rm -r "${S}"/etc/pxs/certs
-		rm "${S}"/etc/pxs/portagexsd.conf
-		rm -r "${S}"/lib/PortageXS/examples
-	fi
-}
-
-pkg_preinst() {
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}"
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}"
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r2.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
index c55b71bce6c4..217d23b34bec 100644
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r2.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r2.ebuild,v 1.11 2012/12/30 15:32:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild,v 1.1 2013/01/03 08:46:32 armin76 Exp $
 
 inherit perl-module eutils prefix
 DESCRIPTION="Portage abstraction layer for perl"
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
index 93af235e57d6..a9968cd7e79e 100644
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
+++ b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
@@ -1,6 +1,6 @@
 diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/PortageXS/Core.pm
---- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm	2012-12-15 19:01:20.267451741 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/Core.pm	2012-12-15 19:06:37.363938909 +0100
+--- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm	2013-01-03 09:32:10.477597366 +0100
++++ PortageXS-0.02.10/lib/PortageXS/Core.pm	2013-01-03 09:32:12.707534858 +0100
 @@ -94,7 +94,7 @@
  	my $self		= shift;
  	my $param		= shift;
@@ -29,8 +29,8 @@ diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/Port
  
  # Description:
 diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl
---- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl	2012-12-15 19:01:20.267451741 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl	2012-12-15 19:07:19.041822742 +0100
+--- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:10.477597366 +0100
++++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:12.707534858 +0100
 @@ -8,4 +8,5 @@
  
  my $pxs=PortageXS->new();
@@ -39,8 +39,17 @@ diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl Porta
 +print join(' 
 +',$pxs->getParamFromFile($pxs->getFileContents('/usr/share/portage/config/make.globals').$pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'))."\n";
 diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS.pm
---- PortageXS-0.02.10.orig/lib/PortageXS.pm	2012-12-15 19:01:20.283451308 +0100
-+++ PortageXS-0.02.10/lib/PortageXS.pm	2012-12-15 19:14:38.882079616 +0100
+--- PortageXS-0.02.10.orig/lib/PortageXS.pm	2013-01-03 09:32:10.478597338 +0100
++++ PortageXS-0.02.10/lib/PortageXS.pm	2013-01-03 09:32:29.710057966 +0100
+@@ -77,7 +77,7 @@
+ 	
+ 	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
+ 	$self->{'ETC_DIR'}			= '/etc/';
+-	$self->{'MAKE_PROFILE_PATH'}		= '/etc/make.profile';
++	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
+ 	
+ 	# - init colors >
+ 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
 @@ -89,7 +89,7 @@
  	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
  	$self->{'COLORS'}{'RESET'}		= color('reset');
@@ -51,8 +60,8 @@ diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS
  		$self->{'COLORS'}{'GREEN'}		= '';
  		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
 diff -ur PortageXS-0.02.10.orig/t/01_Core.t PortageXS-0.02.10/t/01_Core.t
---- PortageXS-0.02.10.orig/t/01_Core.t	2012-12-15 19:01:20.266451768 +0100
-+++ PortageXS-0.02.10/t/01_Core.t	2012-12-15 19:15:33.036638139 +0100
+--- PortageXS-0.02.10.orig/t/01_Core.t	2013-01-03 09:32:10.476597394 +0100
++++ PortageXS-0.02.10/t/01_Core.t	2013-01-03 09:32:12.707534858 +0100
 @@ -14,8 +14,8 @@
  
  # - getFileContents >
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
index 31b6c6bfa148..755bb13bb503 100644
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
+++ b/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
@@ -57,10 +57,10 @@ diff -ur PortageXS-0.02.09.orig/lib/PortageXS.pm PortageXS-0.02.09/lib/PortageXS
  	
 -	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
 -	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/make.profile';
+-	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
 +	$self->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
 +	$self->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
-+	$self->{'MAKE_PROFILE_PATH'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/make.profile';
++	$self->{'MAKE_PROFILE_PATH'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile';
  	
  	# - init colors >
  	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');