Update elog message for new make.conf location, bug 441902. Remove old ebuilds.

(Portage version: 2.2.0_alpha141_p5/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 14 insertions, 190 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 26bab3d87a55..3ecf8d2cc00c 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.161 2012/10/21 03:00:31 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.162 2012/11/06 07:17:09 dolsen Exp $
+
+  06 Nov 2012; Brian Dolbec <dolsen@gentoo.org> -layman-1.4.1.ebuild,
+  layman-1.4.2-r3.ebuild, -layman-2.0.0_rc3.ebuild:
+  Change the elog message for the new default /etc/portage/make.conf location.
+  Bug 441902.
+  Remove old versions.
 
 *layman-2.0.0_rc4 (21 Oct 2012)
 
diff --git a/app-portage/layman/layman-1.4.1.ebuild b/app-portage/layman/layman-1.4.1.ebuild
deleted file mode 100644
index ea4bd15f57a3..000000000000
--- a/app-portage/layman/layman-1.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.1.ebuild,v 1.11 2012/03/10 23:34:58 dolsen Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_USE_WITH="xml"
-
-inherit eutils distutils
-
-DESCRIPTION="Tool to manage Gentoo overlays."
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bazaar cvs darcs git mercurial subversion test"
-
-COMMON_DEPS="dev-lang/python"
-DEPEND="${COMMON_DEPS}
-	test? ( dev-vcs/subversion )"
-RDEPEND="${COMMON_DEPS}
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-src_test() {
-	testing() {
-		for suite in layman/tests/{dtest,external}.py ; do
-			PYTHONPATH="." "$(PYTHON)" ${suite} \
-					|| die "test suite '${suite}' failed"
-		done
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir /etc/layman
-
-	cp etc/* "${D}"/etc/layman/
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo "You are now ready to add overlays into your system."
-	einfo
-	einfo "  layman -L"
-	einfo
-	einfo "will display a list of available overlays."
-	einfo
-	elog  "Select an overlay and add it using"
-	elog
-	elog  "  layman -a overlay-name"
-	elog
-	elog  "If this is the very first overlay you add with layman,"
-	elog  "you need to append the following statement to your"
-	elog  "/etc/make.conf file:"
-	elog
-	elog  "  source /var/lib/layman/make.conf"
-	elog
-	elog  "If you modify the 'storage' parameter in the layman"
-	elog  "configuration file (/etc/layman/layman.cfg) you will"
-	elog  "need to adapt the path given above to the new storage"
-	elog  "directory."
-	elog
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
-	epause 5
-}
diff --git a/app-portage/layman/layman-1.4.2-r3.ebuild b/app-portage/layman/layman-1.4.2-r3.ebuild
index 6ccae541d1a1..b725d1eb39d3 100644
--- a/app-portage/layman/layman-1.4.2-r3.ebuild
+++ b/app-portage/layman/layman-1.4.2-r3.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/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.8 2012/06/17 18:57:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.9 2012/11/06 07:17:09 dolsen Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
@@ -70,7 +70,6 @@ src_install() {
 
 pkg_postinst() {
 	distutils_pkg_postinst
-
 	einfo "You are now ready to add overlays into your system."
 	einfo
 	einfo "  layman -L"
@@ -83,7 +82,12 @@ pkg_postinst() {
 	elog
 	elog  "If this is the very first overlay you add with layman,"
 	elog  "you need to append the following statement to your"
-	elog  "/etc/make.conf file:"
+	# This relates to #441902 bug.
+	if [[ -e "${ROOT}"/etc/portage/make.conf ]] ; then
+		elog  "/etc/portage/make.conf file:"
+	else
+		elog "/etc/make.conf file:"
+	fi
 	elog
 	elog  "  source /var/lib/layman/make.conf"
 	elog
diff --git a/app-portage/layman/layman-2.0.0_rc3.ebuild b/app-portage/layman/layman-2.0.0_rc3.ebuild
deleted file mode 100644
index 670a926a09fe..000000000000
--- a/app-portage/layman/layman-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc3.ebuild,v 1.3 2012/09/20 13:06:17 aballier Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-PYTHON_USE_WITH="xml"
-
-inherit eutils distutils prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs git mercurial subversion test"
-
-COMMON_DEPS="dev-lang/python"
-DEPEND="${COMMON_DEPS}
-	test? ( dev-vcs/subversion )"
-RDEPEND="${COMMON_DEPS}
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)"
-
-src_prepare() {
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-src_test() {
-	testing() {
-		for suite in layman/tests/{dtest,external}.py ; do
-			PYTHONPATH="." "$(PYTHON)" ${suite} \
-					|| die "test suite '${suite}' failed"
-		done
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /etc/layman
-	doins etc/layman.cfg || die
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	ewarn "The installed db file '%(storage)/overlays.xml'"
-	ewarn "has been renamed to '%(storage)/installed.xml'"
-
-	if [ -f "${EROOT}/var/lib/layman/overlays.xml" ]; then
-		mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml"
-		einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml"
-	fi
-
-	einfo "You are now ready to add overlays into your system."
-	einfo
-	einfo "  layman -L"
-	einfo
-	einfo "will display a list of available overlays."
-	einfo
-	elog  "Select an overlay and add it using"
-	elog
-	elog  "  layman -a overlay-name"
-	elog
-	elog  "If this is the very first overlay you add with layman,"
-	elog  "you need to append the following statement to your"
-	elog  "/etc/make.conf file:"
-	elog
-	elog  "  source /var/lib/layman/make.conf"
-	elog
-	elog  "If you modify the 'storage' parameter in the layman"
-	elog  "configuration file (/etc/layman/layman.cfg) you will"
-	elog  "need to adapt the path given above to the new storage"
-	elog  "directory."
-	elog
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
-}