Version bump, fix up license

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

4 files changed, 102 insertions, 19 deletions

diff --git a/dev-util/plan9port/ChangeLog b/dev-util/plan9port/ChangeLog
index d53448a836da..0b42d00d1d39 100644
--- a/dev-util/plan9port/ChangeLog
+++ b/dev-util/plan9port/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/plan9port
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.6 2013/01/04 04:06:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.7 2013/01/05 13:00:12 blueness Exp $
+
+*plan9port-20130103 (05 Jan 2013)
+
+  05 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +plan9port-20130103.ebuild, plan9port-20121219.ebuild:
+  Version bump, fix up license
 
 *plan9port-20121219 (27 Dec 2012)
 
@@ -37,4 +43,3 @@
   +metadata.xml, +plan9port-20070522.ebuild:
   Initial ebuild for Plan9Port, a set of Plan 9 utilities ported to POSIX
   environments.
-
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 28a5f7ac3526..3f679a486892 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX plan9port-9660srv-errno.patch 455 SHA256 62b77ee10409715bf5b73eb1acad09ae7e76c5e9edb12cbb87928e1d6c05c7cb SHA512 049def3e250acfc0e0ecd1829328afa1a6bf9abbc7da9d5776c6558aed5c4b18dcbcd082315afd50fd0645dc92421e3f0edfb1b899e43a07a12a9c26cb2f99d8 WHIRLPOOL 0d6e903f2eafeff7f3c43ef77fb6abfac26784efaf233ff0c1eeb79248d2e202fea2f39aef57e0c15bf0e527b9c5c4c5487800cf6f7f7e5a44bf0f256df68f4d
 AUX plan9port-noexecstack.patch 984 SHA256 eafebec7adf9310eba6b4bc1aec1ea41ad3cdd73b366471278dd4439643351ea SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8 WHIRLPOOL 997262eb672ce3836309216eb31219671051d1e7b936c98811a668cbe481a820140ec07555871940a367e730e7206ab90e7d8705ee9f0fae50fe613c400f5e22
 DIST plan9port-20121219.tgz 54175831 SHA256 289a355f0dee5900ece427a5360a510879e305e31c02f76dfe0495629ff38824 SHA512 6086fc3330327a36059fc2ce4170a3b7abac7562d141206e305dff20ec970d11d7fffe3d72848bd6def66179b70908444b638f10064e10f7f97a8e4630438892 WHIRLPOOL eb859377af45b053d1ebcf8132ecc043f1d60c0f30f6a6b59db1cc1f9a899b61432179d6d67129c4400a0bb7c935f9a341bb4111de4d5daf15888c949b343f41
-EBUILD plan9port-20121219.ebuild 2185 SHA256 655b46aecc936da21e8aa6d81806af908b849423098564879cf167e52267248d SHA512 2a7a9348b9a24494eabf0623798212b9e468468b8defecb70ee1e1de1235dba7bb7c80ab9c2aa946e5092d1450f606b30d179cfc6eba774b8f27dce115c29b8f WHIRLPOOL e8ab8167f0a7b0216ca32bff547655cd2e7bab04598b17abd56421071742fb2ddf9a3a9ff3c3a56ca4c70f372a0d86de0da3d0f1a117ba8c60cbdf7452e2607e
-MISC ChangeLog 1706 SHA256 948a62dab8cceef05ad19c2aaf7dc39256cde0f7182942a4cd6923819ac6d298 SHA512 3b81deff85ddeb3488879d7033ee23f8c24d429e2525c6e96b330e7ac0c26dc65eca4ff893172e7bc7e2a99c4aee01439ba9f3ea818f25ac81d956d65b24d150 WHIRLPOOL e7a4543d4630854d7b9e894274cfdadc31966c4575f05995c23447e29c2f1541341507ad61a9f6b756bd4051fe1a052a7ec2da7960fd40ca74129c20843ca096
+DIST plan9port-20130103.tgz 54176071 SHA256 62c43c14d2d299c427c1d89cf6755c845c0992f0a0f65d6aca202fd24c1d5333 SHA512 b910b94040a8b745dca8750d2e4c8553dcf49885eaa659092ce261f7b761ea13860278f1ec59d4036be2fbd883b099af32dfc0c40e7f3d0cd329c9278527663f WHIRLPOOL ac2a742585072d54e7ddf0b7c264f958d6f999c6263aef483a1763d14446c65c40f94a6d60d49aecc7899fa123da59c7a62628fc47f9fdf09b76e5f195d8668f
+EBUILD plan9port-20121219.ebuild 2218 SHA256 00afa924635be6430ba459184dbd6d4bad54f62e3fd7a69f1ef05b158ba42170 SHA512 602169d06aa2d39b498227c2b54e08816e98ab13df71e31e7f03f8485db9a07ef55e716cc234623533dfbca8ae6a9fce4fac9c29dffdeded498068e0edc5559e WHIRLPOOL 6b7d7250657e12a3d96c191720703f7c0829dc42259b5eeacb7f36f24060af4a5940ba7695e3b7ca21ee3340a771d7a51672fb154dcb58ac9a04627fec0afa5c
+EBUILD plan9port-20130103.ebuild 2218 SHA256 cfe056f350d1631f4eb1f4cd288fb84d265045ddd03341824fecbd50a06dac2b SHA512 d2dca49382e70f6515da5068cea7a9bf35abc56b140987f7dab93d476c808b93b541678e2757a43c74f754832f19a52d433256c33adc7bf40a644a5a529ddc77 WHIRLPOOL fb717bc30b66f0ecc576f2ccd869854e5671e138b4df043068b3fa0eb5f45d1c95c7589d2b6d70622c2b943b9bd0a696bc82a6d474e9c313f11ef077aab0af1d
+MISC ChangeLog 1884 SHA256 a78087e78886189303b9eef71eb9a28847caf18abdd0131bf570e09c0a81e4f5 SHA512 284f8377ba69e16954ca18c7fd7dcea26c4e16627cc34d51dca5c83d14449d6e0e1c81eca6e3cad53c88fd40b38122e60847638326d27d2006792cdef08e0c06 WHIRLPOOL 98488d48d09531f9e54654680624b30195a18211ebbb48eb400b73e1c716a3ba3c9add1de2c97613c0053ded8781c3dc39bca3b8a0e8fa9d74041d4ff70e9868
 MISC metadata.xml 458 SHA256 6ad98558ddca5de6ba7571ad0d7780959ee98907bc7ea1a5e5369439731f619a SHA512 340989f489ed33526a39443a7887a876c7ea690271019fe807f22d81ca937ca571eb792fbf4055fbff7cfb6145e72afc166cfbbdcc334f2a856710bae57e9dca WHIRLPOOL a0f9e888b876eee5315400b132542634f65b1e06b0629cf06458aeeaea2c7b8b8584445ea797ce862b0e102355dd168e360cc69200c0b83cba08821e39476355
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5lVYAAoJEJOE+m71LUu672wP/1eDHZp2nlZ6ccVT78fnhc4D
-ld6EMCfa0ycfwk4JwJiT03RbQOeb0IbcE/PmaQMZTJCVTXOxKWr/eqyZZRM9PlH4
-Ba2GZ3cxagAv4nd6W0DAu0Rie5kFeDFVHzS/xvS0asxMdcja8x6qPUHHKRaX2CDf
-Y1o4bJuw10ptRFDCqWzJZg+xO89mfVL6jcB1JMV1G4vItVdZJ+VTvLsohOEOr9Mo
-TAP1lY+VgSS8j+1fpn/dz6s7ffs3r8tQy/YOnJZ8ttqhIJSXuW7pN+QNIuPiQpMj
-92JVwp8A0C+qW8kAbxntvUx8FRXr0LxUEp+H1z8YtXG17BuNIPvsg1W1RvyPzA26
-CqwWXiDUb/EH24lusJWk6ryFFbvvJ3rKcGY1Ujz7kO1DsjUXKDYjGV+3pqgxu859
-bXFGLXvi9eH8ZB2Eaq8GYRYmkOAYJICRnj4Kb0ROR+6Ric+42znlzs+oVuPr10dp
-FFk6D0QE4XNeZ7mURW76bCanM9qQeRRDng5sPjz8F/4NLgkTAbqukkhCG55qRfba
-v4ukQ8C27dvTqD3H0bAjVMFqY5bIKnxNBPXxSwsEBJ4KyMhIBs3dfhK6n2CDaAG9
-+dpS3MMBNUOcCLykJu+ky/OY1MZ6VfYqgwNbeuXJmHhRlxkAbjXMLUSKRyxh0wzt
-XQ2rkioxxtom7MJgoqpH
-=ohl5
+iQIcBAEBCAAGBQJQ6CPpAAoJEJOE+m71LUu6yiUP/3D9Ryofu9XasIgJ5EiYFzNQ
+AvLutJSnImh8btlXarN4OazERL6FTHTU9ahfc2EVlP3p5ji5ADJJzLoSCPcVMukE
+aRgEgkc6wxdYdljIecDvIEhLfNBkpP+7s/Vc/G0W9LUjVDfibyifAr0DFv+cjGms
+I5cazkKS0Tu7S/Iyj2eRHX1+GXPpvctJYAQE0iyQwg75zrHapvzE180scC2STLK5
+hWpWS+wJhxWq7ZVI0vgnGKM1bHYMHkSrgy8gLz0L1iQw414Eg6aN+3ReR92rnk6y
+qpeGOE+qWjjZftsTAvPVPGVA2QDJc2XsK31x+bOi1w1+ZcERMoy2icDVGCRRyVDg
+0lFsn0gs0+aWUDGzoikXBu6mum4KAVjR++xhdygwmXuS1UxGINui43mqO6G/VscN
+tXQ1VUJMBZXnv6sKtyHngj6IhxiFCuxMtUdI93kOnT+jqM+DCYfYjGTDJW+SKcni
+u8jg3k3GZygp8vdLHvz2nd+Lec0p4LsJWeEG9UWWEr0ieuszi0SbiwTJuiUXNh1U
+RLBRPL6vReSbU1IzphgBvckLJ+pVQgeIYgfZvF9T196ia9I2wpyZ3RT+FF5ZcHfM
+cx5JVHDX/eXKTLNQ4JV1gpOiprs1fVtUFbYFtG1Xge7uuvqSD7nsOPQJ8097Sq+l
+llzuj5JzKIMvzUUF98fQ
+=8yk2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/plan9port/plan9port-20121219.ebuild b/dev-util/plan9port/plan9port-20121219.ebuild
index bc0ff467ea6b..3cc0a426cfb2 100644
--- a/dev-util/plan9port/plan9port-20121219.ebuild
+++ b/dev-util/plan9port/plan9port-20121219.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20121219.ebuild,v 1.2 2013/01/04 04:06:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20121219.ebuild,v 1.3 2013/01/05 13:00:12 blueness Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ 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"
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-util/plan9port/plan9port-20130103.ebuild b/dev-util/plan9port/plan9port-20130103.ebuild
new file mode 100644
index 000000000000..e031aae57b6a
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20130103.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130103.ebuild,v 1.1 2013/01/05 13:00:12 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=""
+
+DEPEND="x11-apps/xauth"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack}".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_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
+}
+
+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."
+}