Optionally depend on X, fix build system, bug #463616

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

7 files changed, 65 insertions, 256 deletions

diff --git a/dev-util/plan9port/ChangeLog b/dev-util/plan9port/ChangeLog
index 735c144d108f..c9c49da69d47 100644
--- a/dev-util/plan9port/ChangeLog
+++ b/dev-util/plan9port/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2013/03/22 12:06:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.16 2013/06/21 14:35:52 blueness Exp $
+
+*plan9port-20130320-r1 (21 Jun 2013)
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/plan9port-builderr.patch, +plan9port-20130320-r1.ebuild,
+  -plan9port-20130119.ebuild, -plan9port-20130131.ebuild,
+  -plan9port-20130209-r1.ebuild, -plan9port-20130308.ebuild:
+  Optionally depend on X, fix build system, bug #463616
 
 *plan9port-20130320 (22 Mar 2013)
 
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 509906c28e45..26ea21762703 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -2,34 +2,28 @@
 Hash: SHA256
 
 AUX plan9port-9660srv-errno.patch 455 SHA256 62b77ee10409715bf5b73eb1acad09ae7e76c5e9edb12cbb87928e1d6c05c7cb SHA512 049def3e250acfc0e0ecd1829328afa1a6bf9abbc7da9d5776c6558aed5c4b18dcbcd082315afd50fd0645dc92421e3f0edfb1b899e43a07a12a9c26cb2f99d8 WHIRLPOOL 0d6e903f2eafeff7f3c43ef77fb6abfac26784efaf233ff0c1eeb79248d2e202fea2f39aef57e0c15bf0e527b9c5c4c5487800cf6f7f7e5a44bf0f256df68f4d
+AUX plan9port-builderr.patch 936 SHA256 d0d97cac6d9b42c7eaafc1f94e688080bbfe957495ac1e08e55e1cc95880e8a3 SHA512 d95e6c5b4b75d54167721f7250288b8640945ebeb10ff346e989a4690828bb8448e46cbcf30d5e35c27d094680b2995ca04b8106c4dce083260f605fc2024d84 WHIRLPOOL 220c2a759cd70f21107e908c80bf0a35a5663e7073d22160972280421d5c91b0b3ece6660a6d9bfe6bec1f7cf9a58f92f3696e5db8c60e2d1a5ea7518b4a9b44
 AUX plan9port-cflags.patch 328 SHA256 ef9e325972b4f4320bbfcfb4d57cd6e06241c820643b189c2f85feed504df581 SHA512 281b236893cc1efde75d7fc5160168c8602a5eff27229f9b0e2b1284ac36cf73fdbd22f2ae4d3776556f7b881ad63f4dd68d56628942ca6e84abca12b93616bc WHIRLPOOL 73a5afd2adfaa625ee0e5cf3f40c93da6c8859567992e4e3b380dc70b6080f6aba2eb6bc767911a4d7535f3d2034e52a541d5abf693b24f976cf18ba92f876d7
 AUX plan9port-noexecstack.patch 984 SHA256 eafebec7adf9310eba6b4bc1aec1ea41ad3cdd73b366471278dd4439643351ea SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8 WHIRLPOOL 997262eb672ce3836309216eb31219671051d1e7b936c98811a668cbe481a820140ec07555871940a367e730e7206ab90e7d8705ee9f0fae50fe613c400f5e22
-DIST plan9port-20130119.tgz 54176486 SHA256 d63733c4396e2569a04131517e86f253e270f1370449f63c422316488f8d63e1 SHA512 f81795937a6e8ca99cd5a7d59f601298bd14db2cff4141054731985ac806b74927988562530701adb2d0657c508576273a5b13e748f7818d8e49a3abba5521ea WHIRLPOOL 4d83740b046b99d3687069dd95f8265ff7816bc674f4edce2870d1f439fd9820c2efef73e104aab9c22eb073f76198b6a35223ff82a567272f9d8fa0ff68b945
-DIST plan9port-20130131.tgz 54178455 SHA256 ece69e2e4b0f46e8bafef1ea77dbbb616e3b5af0ae0f617e1aa5470fe4351110 SHA512 a8169ffd6f0f469e6c31e62b0b7ead6a31d05a4d3f73cff108c6dd5728ad84f05de88c82b9cd135d8c16b541e38f472413da69e4f9d7aebc6ad91a5be89c390d WHIRLPOOL 0598d959a69a474967458b0e471c32742c676d714b734200ae63624c6f114991616c8fa78fe5c02c45f74b8f3edc50759df547118cc9ef136dd093307aa35a56
-DIST plan9port-20130209.tgz 54179646 SHA256 39d1cd0b09444b19351bd52b1f0574be14a6faffae57e9673bed48d168952da7 SHA512 21f3cf29b517a43cba5871e8c007a81b88f87aeed8b89ff5a395af0d84bce77f873186e54c09a3acdd9e15649ea432bebb2032ec120074c450d3b7b44f79c531 WHIRLPOOL 49769f370b18fc809b61959655c2e2e28f865fa2f02fec09f21b29d0f4d60535ef5f0c554e38059936594c0e95223a5cdf9475ae609fdcea2836d4e995ff03de
-DIST plan9port-20130308.tgz 54181899 SHA256 a3757adcdf922c7660342f5690b9d7ec2cd0fed259a9e58a2169e0be0de995ee SHA512 1df8fcf1a6f2a8c8a5a7a1073b4bfd1ce855b8edba9ca933cb2c28891e5db70934958dad530807ec0167f2badf51be897d367b05844c75200a04a465989260aa WHIRLPOOL 55e1ceeaed3f19ca8b666aa2741f9e59e633968089e47cd90b194909772f4fbde2f3e179d25d145b282e79101b4c9805d9e4f09528f00734b5007603817bd23a
 DIST plan9port-20130320.tgz 54184719 SHA256 d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512 fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7 WHIRLPOOL 5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f
-EBUILD plan9port-20130119.ebuild 2218 SHA256 429b5d0c476bcf60c917032d78783ba9e1f1b196fecd6d2bb5b509f905db550f SHA512 c55e15091ac579b4075bc16132c3cd9bf1a0c8178d16370085dd09859058ee86116014333a3adf2a0e0159c43ddb287110c7901a9c47d420522d137bb4e29770 WHIRLPOOL 0bb3c92f0433bb2576959a82b573ae20236d1a52b74eb0bcf075e71f481f60180802718e69c48fb814eca6e2db95c99450f4e60e6e4f267a17c6e3f764be547c
-EBUILD plan9port-20130131.ebuild 2218 SHA256 6bfd1c2991735827e308188ed5985483daab4ec17dc9286f778114865c9338cc SHA512 0d54de7da8197aa060996fca641ccc1680088089bdc8fb4035046a51de576c97ee7df94d4405b829364f69a6a044fe274fdc891552f3c0b0f0fe4ce9040a9ecc WHIRLPOOL 79c72e6fb997cd68603fc51e4910c000ea04c4dfd229fcfe1ff20c17088ac26eb0200c2a2cb0c73ea2d98ba4ff8ffdb1255ec4d2d3feda7c9f798c0c7d737bb4
-EBUILD plan9port-20130209-r1.ebuild 2228 SHA256 7914e6f812a70919e841d8a5e052121546ad7f8b5141635bed3f94a45f5e0ace SHA512 2a6b0d88f38fd0041b9c7f764610a4f58e81c046359725dec1f4d91c1dbca51da1ec398e4c85c37d982770e381e3f45cb0b0eb06bf5e1ddb8236a33f5a667e45 WHIRLPOOL 90a49d269598372aa070bf22ca648e5054a52ceddd87e0c0e7d2c5e1e48e79896c152c4252634e4be5e454004be7768948a1213a101f16243119cbe05cdf5ec0
-EBUILD plan9port-20130308.ebuild 2225 SHA256 618caab05b58983f019f5869b6e8cab3f64793846c7dd0618f00e0009353c7ed SHA512 41c470f50c4d12d9a41241990301b6e0f64adfdee69eb78496f1be7994f1655554655ba5d698fe45b4cef5d98b1b0a2b1d6f41ee9a10e9755b3e45f18be0b1cf WHIRLPOOL 0e0ab84f9fa3a7a1c28f6d4d6f4efe9e210e525bb81d632f5590daad6342a3aff54ceb8a2a3d5845f6ab4656cd6beddd04bc7823ec451e8dc446a6c6322b9c8b
+EBUILD plan9port-20130320-r1.ebuild 2329 SHA256 0b3ee709cdc6f050c563bc365c124c735e9cf315f5dca77632399d88d01e44b7 SHA512 5de48aa1954a6477cab3cc0ccd56398fa8abe936913ed0991e437f171132e929d3b922530e40c718664558b5312834303cce5654a590b8e1d064bf4e62cc50f0 WHIRLPOOL 3fe773c0af9e98d0823ef8cb7b4ecd8a845eeb7e9d7287fce722097b7587d80cdf9ef3e72a0f078428ca99e4a7182c95edadb76750b5e3563c128fc70234d59f
 EBUILD plan9port-20130320.ebuild 2225 SHA256 24ec45c20ba20794e48b8da1d45449d3ae9d6107a3a25eb428df041a160a788d SHA512 7202575ca847eeea7b230287cdc8c9dc48244fd456316b0a5f365d2dd826ccc38b1ce8333121244156a2233de482382864b1dab2a7e8783a3296d93f9e13ec71 WHIRLPOOL 6c556921607f6ed5b8cba3f77004abed002f87c505e8575695e5d195110aad729cf3ad9e13a895c62d811d2400f07f01ed195abc75f68c82fbaee3d021ad47d8
-MISC ChangeLog 3130 SHA256 4cd9e4eb129d9e8d4a0e963ac3bebde3b7e53753199d24b7ea40a088b92bf202 SHA512 c5127116e0ee74e9cfb9f771d5643fd2907c10fd32c6c01094a8cd6107fcbcf59c1d252c0a99fd3ef402bcf46cdfc6d449a71c49b3787d354e2498937c9297ef WHIRLPOOL cc1bf499ea401375092141800895ae7eebb45300acb4844ccb449ed11fe46d6f80909a37645b97ee98e768de946eac75c01d29857bca605b6a237bb2fdc14dc8
+MISC ChangeLog 3465 SHA256 41de8ee852dedd4995326aeff1e1061a5b37a35aff67630a6e74fba9e19517af SHA512 321fcc6bcd35b2f41caede22d17d8349b2c7380b1ab69dc656bd635f49bef4b99b1231f1c3a533532892198e37fbe4d211ac3af44e9b0bb313fde716a834b0cc WHIRLPOOL 3754af0f2b06cdde1e47b31c4e03b0fcb9bdb30c24c3a76aeb177be0d35423cd530e089846f21703c55aeb733c3b27438ce981096e0745d763659629ab3691c1
 MISC metadata.xml 490 SHA256 9445c40f91b8390422b4707cf254da8260f42d50b4ca0abfeebdc19cff13990b SHA512 50e8479657414b7420d4988beea471311b45d2b58ddf3d1f735063f195b80cf6acf7d21de8afaf802ea291cb53b8dc0163e880d468e904fb641af6570e632b92 WHIRLPOOL 9a3444cb053a047e5adbcd50d04e2a7862920b5f6e1e1f36a9fe36253705f0330de1483115cf608e926e56848a54f8cd04a70ccba0b9696521a622b39dba7bae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTEk5AAoJEJOE+m71LUu6QJkP/A8F+fNMHABqMzszXJ86yuzs
-GyNJT1gnHb0AXgoiaVEt9vo0Sl87iEgQiOPqHzh0svbs3KX1UzDiERvvnJzlx7LA
-a4q7c/5HK2rafrYEIPf3daA+80AVtb1oEuW5jGoOr0xH/3hvc9jzL/MzW6CR74mC
-LDF6TG7KdiQje/yXH9XZjeGs9aULqxsq95KTt8VcfKplaJZlW7WfRgy6GCC7d9Eq
-XaFllGu7M160hqIcGpK7esg1hNA4S+iwp2k0SjDlkOkqxW+Bd8gkiDvBPC4BURH8
-WQqUCKqPrtjd/X7M7m9VpW900EIQjBHFkuYKTN+wHhw3jbF6vlIgR8cu5Wqa5qb2
-dKlQzutBm64/v0HznISktDuMuYoXOp6A1PZ72zbu6/9J9mKPg2s16NRWZRKGZbuo
-WkdTArX5MZZ8c2/JXLdxA/QZnduNm0bWWowg1TsNh+/FdN5nlHBpbftPJtRaZ/aa
-8WMnm2Lzq5k94g0+vilNlYgEY5YzRrCbBz34aNMByGVpjurvqHuL1Ca4wbtkKzYt
-Mf3MIJMjNpWaO9XNay7Bc1fBDYVx1EK+8DabwJAnknOvCoZIUZ/g6L/xjeCYENl8
-brx/rq2/uU2XKZDNzhZ5l6a1h6zOndm8NhFIeHORycq+aDuj2UNSzDJ0KhcMx95E
-1GvYMmK3zBKG3Q7upgfl
-=mDic
+iQIcBAEBCAAGBQJRxGUWAAoJEJOE+m71LUu6tawQAKIqawj67c6LuXrEtWl9E6sS
+grRos40eaQpGkCADj51omJTQjvYBmt5NoUnfKdXbAIfIUnEHeDJ/ERk20H8dsyVA
+/EYAgCYOaDtnWM7P1LrDnUGiwro6vXWHtsLwcA/QDh7dNEi7KSpaLjTEZidIGbMr
+J8WX1NbEnoMOGw38Gnq8oZ9LxKM+akle44SrCJpF7vvAYsdFvcW2yEAap96fs6L0
+cKEkUireRnWxdBoS1+R3HK5Bm3/UuqQtTagt2Jf2eL4YsdDWzf8J7S4G821gw8uu
+zCoHcgvnK84CAlx0sY6x6vMepI0453z9avuChWQZz7+iV3CGxarECMTlEoCpuSjV
+cgH9ZgMdY8cy3CYc/RvNv7ogqW4tEpcS7xlDEaRq+JZExOzmm3vlJZYeQLTGyRxW
+yPMdo3y9OMdE7VZrYHSlW0jbYrh7ftB4jY85hi6cDcm1ix052wq9diO/dmRWG9ba
+C4Rt1SROeP95xfahNvECzjaIyy4NHEde25cb0jtBMLO6bIgMT3hwYLyqG2iawaMf
+L9UKxl1dzqrmf3AI+T1AVgq0qqy14WISFRxd9s3Bbj04sbEKkLsYTbTakVQncJXw
+w2rD0YQ71hbnQ7nuOYh7H5x3RDpGYKfgr2Y7wYkviFIQSYnuAOBf6rL0pgXZrRsb
+rEBn1w2o4ptpp0MJLxx7
+=5R25
 -----END PGP SIGNATURE-----
diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch
new file mode 100644
index 000000000000..266f10c4b9d5
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-builderr.patch
@@ -0,0 +1,29 @@
+Prevent mk from ignoring errors
+
+By default, the plan9port INSTALL script doesn't report build error,
+which can result in a mostly broken build begin installed.
+--- a/INSTALL
++++ b/INSTALL
+@@ -41,7 +41,6 @@ echo " "
+ echo "* Resetting $PLAN9/config"
+ rm -f config
+ 
+-(
+ echo "* Compiler version:"
+ 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
+ 
+@@ -134,7 +133,7 @@ if $dobuild; then
+ 		echo "* Warning: not all binaries built successfully."
+ 	fi
+ 	echo "* Installing everything in $PLAN9/bin..."
+-	mk -k install || exit 1
++	mk install || exit 1
+ 	if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then
+ 		echo " "
+ 		echo "* Warning: not all binaries built successfully."
+@@ -182,5 +181,4 @@ if $doinstall; then
+ 	echo "	PLAN9=$PLAN9 export PLAN9"
+ 	echo '	PATH=$PATH:$PLAN9/bin export PATH'
+ fi
+-) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum
+ 
diff --git a/dev-util/plan9port/plan9port-20130131.ebuild b/dev-util/plan9port/plan9port-20130131.ebuild
deleted file mode 100644
index 55f81933a0d6..000000000000
--- a/dev-util/plan9port/plan9port-20130131.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-20130131.ebuild,v 1.1 2013/02/02 01:32:40 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."
-}
diff --git a/dev-util/plan9port/plan9port-20130209-r1.ebuild b/dev-util/plan9port/plan9port-20130209-r1.ebuild
deleted file mode 100644
index 5d456f73b453..000000000000
--- a/dev-util/plan9port/plan9port-20130209-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-20130209-r1.ebuild,v 1.1 2013/02/12 01:27:31 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,cflags}".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."
-}
diff --git a/dev-util/plan9port/plan9port-20130308.ebuild b/dev-util/plan9port/plan9port-20130308.ebuild
deleted file mode 100644
index 32062af2bae7..000000000000
--- a/dev-util/plan9port/plan9port-20130308.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-20130308.ebuild,v 1.1 2013/03/09 15:14:40 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,cflags}".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."
-}
diff --git a/dev-util/plan9port/plan9port-20130119.ebuild b/dev-util/plan9port/plan9port-20130320-r1.ebuild
index bfa197ba518a..9a1cbe1a0f01 100644
--- a/dev-util/plan9port/plan9port-20130119.ebuild
+++ b/dev-util/plan9port/plan9port-20130320-r1.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-20130119.ebuild,v 1.1 2013/01/20 10:58:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130320-r1.ebuild,v 1.1 2013/06/21 14:35:52 blueness Exp $
 
 EAPI="4"
 
@@ -13,9 +13,9 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
 LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="X"
 
-DEPEND="x11-apps/xauth"
+DEPEND="X? ( x11-apps/xauth )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
@@ -24,7 +24,7 @@ PLAN9=/usr/lib/plan9
 
 src_prepare()
 {
-	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack}".patch"
+	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"
@@ -32,6 +32,12 @@ src_prepare()
 	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')"