Version bump, remove older

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 10 insertions, 86 deletions

diff --git a/dev-util/plan9port/ChangeLog b/dev-util/plan9port/ChangeLog
index 7824f25cb0b6..8f025cad96a2 100644
--- a/dev-util/plan9port/ChangeLog
+++ b/dev-util/plan9port/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/plan9port
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.33 2014/02/25 14:41:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.34 2014/03/01 16:24:54 blueness Exp $
+
+*plan9port-20140228 (01 Mar 2014)
+
+  01 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +plan9port-20140228.ebuild, -plan9port-20140107.ebuild,
+  -plan9port-20140123.ebuild:
+  Version bump, remove older
 
 *plan9port-20140224 (25 Feb 2014)
 
diff --git a/dev-util/plan9port/plan9port-20140123.ebuild b/dev-util/plan9port/plan9port-20140123.ebuild
deleted file mode 100644
index 079dec73a011..000000000000
--- a/dev-util/plan9port/plan9port-20140123.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140123.ebuild,v 1.2 2014/02/10 13:00:00 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-apps/xauth )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PLAN9=/usr/lib/plan9
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags,builderr}".patch"
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
-}
-
-src_configure() {
-	if ! use X; then
-		echo "WSYSTYPE=nowsys" >> LOCAL.config
-	fi
-}
-
-src_compile() {
-	# Convert -j5 to NPROC=5 for mk
-	export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')"
-
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
-}
-
-src_install() {
-	dodir "${PLAN9}"
-
-	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
-
-	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${D}/${PLAN9}"
-
-	# build the environment variables and install them in env.d
-	cat > "${T}/30plan9" <<-EOF
-		PLAN9="${PLAN9}"
-		PATH="${PLAN9}/bin"
-		ROOTPATH="${PLAN9}/bin"
-		MANPATH="${PLAN9}/man"
-	EOF
-	doenvd "${T}/30plan9"
-}
-
-pkg_postinst() {
-	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
-	elog "also been appropriately set, please use env-update and"
-	elog "source /etc/profile to bring that into immediate effect."
-	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
-	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
-	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
-	elog
-	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
diff --git a/dev-util/plan9port/plan9port-20140107.ebuild b/dev-util/plan9port/plan9port-20140228.ebuild
index 9fbde46eece2..5224223c1cbe 100644
--- a/dev-util/plan9port/plan9port-20140107.ebuild
+++ b/dev-util/plan9port/plan9port-20140228.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140107.ebuild,v 1.2 2014/02/10 13:00:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140228.ebuild,v 1.1 2014/03/01 16:24:54 blueness Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
 
 src_prepare()
 {
-	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags,builderr}".patch"
+	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
 
 	# Fix paths, done in place of ./INSTALL -c
 	einfo "Fixing hard-coded /usr/local/plan9 paths"