Version bump.

(Portage version: 14029-svn/cvs/Linux x86_64)

5 files changed, 12 insertions, 79 deletions

diff --git a/app-admin/eselect-python/ChangeLog b/app-admin/eselect-python/ChangeLog
index 0debf96101da..021efb75c4b8 100644
--- a/app-admin/eselect-python/ChangeLog
+++ b/app-admin/eselect-python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/eselect-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.36 2009/08/13 01:45:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.37 2009/08/14 19:52:33 arfrever Exp $
+
+*eselect-python-20090814 (14 Aug 2009)
+
+  14 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -eselect-python-20080521.ebuild, -eselect-python-20080925.ebuild,
+  -eselect-python-20090801.ebuild, -eselect-python-20090804.ebuild,
+  +eselect-python-20090814.ebuild:
+  Version bump.
 
   13 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   eselect-python-20090804.ebuild:
diff --git a/app-admin/eselect-python/eselect-python-20080521.ebuild b/app-admin/eselect-python/eselect-python-20080521.ebuild
deleted file mode 100644
index 495aaf8e03c0..000000000000
--- a/app-admin/eselect-python/eselect-python-20080521.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20080521.ebuild,v 1.5 2008/06/22 21:06:52 opfer Exp $
-
-DESCRIPTION="Manages multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/python.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.2"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/python.eselect-${PVR}" python.eselect || die
-}
diff --git a/app-admin/eselect-python/eselect-python-20080925.ebuild b/app-admin/eselect-python/eselect-python-20080925.ebuild
deleted file mode 100644
index ff82f3f24dfa..000000000000
--- a/app-admin/eselect-python/eselect-python-20080925.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20080925.ebuild,v 1.9 2009/05/25 16:05:47 ranger Exp $
-
-DESCRIPTION="Manages multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/python.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.2"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/python.eselect-${PVR}" python.eselect || die
-}
diff --git a/app-admin/eselect-python/eselect-python-20090801.ebuild b/app-admin/eselect-python/eselect-python-20090801.ebuild
deleted file mode 100644
index 92c055550f71..000000000000
--- a/app-admin/eselect-python/eselect-python-20090801.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20090801.ebuild,v 1.3 2009/08/03 15:07:14 flameeyes Exp $
-
-DESCRIPTION="Manages multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="mirror://gentoo/python.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=app-admin/eselect-1.0.2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/python.eselect-${PVR}" python.eselect || die "newins python.eselect failed"
-
-	# Fix shebang (bug #279875).
-	sed -e 's:/bin/sh:/bin/bash:' -i "${D}/usr/share/eselect/modules/python.eselect" || die "sed failed"
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-20090801"; then
-		run_eselect_python_update="1"
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${run_eselect_python_update}" == "1" ]]; then
-		ebegin "Running \`eselect python update\`"
-		eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
-		eend "$?"
-	fi
-}
diff --git a/app-admin/eselect-python/eselect-python-20090804.ebuild b/app-admin/eselect-python/eselect-python-20090814.ebuild
index 2ed797cc32a1..eaf3b26ac849 100644
--- a/app-admin/eselect-python/eselect-python-20090804.ebuild
+++ b/app-admin/eselect-python/eselect-python-20090814.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20090804.ebuild,v 1.4 2009/08/13 01:45:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20090814.ebuild,v 1.1 2009/08/14 19:52:33 arfrever Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -21,8 +21,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	echo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o python-wrapper python.c
-	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o python-wrapper python.c || die "Building of python wrapper failed"
+	echo $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o python-wrapper python-wrapper.c
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o python-wrapper python-wrapper.c || die "Building of python-wrapper failed"
 }
 
 src_install() {