Add MANPATH to /etc/env.d/99xstow, bug #505322. Thanks to Erik Falor.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 75 insertions, 4 deletions

diff --git a/app-admin/xstow/ChangeLog b/app-admin/xstow/ChangeLog
index 3824f8dc90a9..73040d5e65f8 100644
--- a/app-admin/xstow/ChangeLog
+++ b/app-admin/xstow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/xstow
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.16 2013/05/10 06:11:33 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.17 2014/03/26 16:01:56 maksbotan Exp $
+
+*xstow-1.0.1 (26 Mar 2014)
+
+  26 Mar 2014; Maxim Koltsov <maksbotan@gentoo.org> +xstow-1.0.1.ebuild,
+  files/99xstow:
+  Add MANPATH to /etc/env.d/99xstow, bug #505322. Thanks to Erik Falor.
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org> xstow-0.5.1.ebuild,
   xstow-1.0.0-r1.ebuild, xstow-1.0.0.ebuild:
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 6f75105e671a..672d3884d806 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,9 +1,25 @@
-AUX 99xstow 38 SHA256 96dfca272df0c4919bf76c2eb4e147c624c07fecac9cf5dd074d1098dbd64e92 SHA512 3c5c625bf52692f23dca235dfaa7f0fd541e2024807ec4889fdd6b6c438246001acbc891b3894a3ca56af701d04791b64df7fec634f7a77f4f17fef7bd04ff6e WHIRLPOOL 3c2ff0be288199d146757902b6d1fe85097cb9fb055a4d7d3ce3313c28b2f986c5d2de8fb6ce0a7614d0b0d6b441abdcbf46b5e1504951ea39b16d6c66e46ea3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 99xstow 65 SHA256 68103af0c35467cf1a726d7a7ac7815d1e4f7ed5c62058d87904829b2081bd76 SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476 WHIRLPOOL 1eed3b955957af4e32417cb25919f17580ddbd10a2908bd3c8bf9f1ada619043ffda23fa5b71a64ff3287c01585103abe8a1ca79aef6d13534dea1a494dd15d3
 AUX xstow-0.5.1-gcc43.patch 2015 SHA256 08d00d639f79bdfd4f4c81bea467f98bd6617ca6a47e5cee6ce2e91d1187e293 SHA512 3fba80df10f6627af74ef0c08f2ea3ba1fd76e04d8263bc4ed5735af57c7bb2e67eb4ed52cb40792932e9b317110c142bea29e060a9bf01d12aaf46f23cd5138 WHIRLPOOL 4de5054f363c39320e2a788900682c6ac0aaca07b0246381743264c0addc4302715462fd1557bcf11fb4f95ec6c2d6bedf82f0e42368bf18b488329fb2cd4c88
 DIST xstow-0.5.1.tar.gz 138091 SHA256 7543a46dd61a352647c74d60080d8a2c50db0c0b178316b6a367d7e60e2b38cf SHA512 edff535844066b0eb464a81e103d1717ca9c3fca8faaf7f92da607f4879cd0ef0fc7191b35ceb22f21c8e7747efede56a363f04a684e3aee66578c82227ff75c WHIRLPOOL 945eb5dba1cef0d25a036bc873b618dd87bb16f699774581bc26c0c91675e7a685ca613ff4226ec6c931860cdd0c81dc519a614495a3bcf17eb49dbb77120b8c
 DIST xstow-1.0.0.tar.bz2 153206 SHA256 0109f10fb25a474803ec357a38c17d806dd9a21eac39b21d79b48c2af571c0fe SHA512 1bc4d6d1c5bcc68c07ac9386c964878591e63e452f46ca974460005df385647937d689ce00221d81de54983036660107b36fce174ff4859bb597f32b60b02a6e WHIRLPOOL f5b0490deaf4be76109e81c55ac8f5588648c0bf5310b578211e402ec207617253cabeb7bf86279bb5df462be5d1b4be8df8ea093a73288d0dac9962bc75848c
+DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a
 EBUILD xstow-0.5.1.ebuild 862 SHA256 c11bed8a5112be4aa48def06351cf2f1df10513e4dc690103e72cfe5acec9b5c SHA512 bb3bcc6b6658f19b35df99788c9d5ccfccc2e16160b8b96ed13bb8358f5804cc1a326de88008fc417b8017bd98d159c86661ad6de39526cf578a8c93a0dcda85 WHIRLPOOL fa6df58ca7b45ebc6d1aeba157acc195658b80c6918394fe4a5fbf48d2bc0d4598910da17665ed21702a57ca6ed923833db3bd2a9345d69addaf518f8750879c
 EBUILD xstow-1.0.0-r1.ebuild 1380 SHA256 9fc6430c7401ee3d1e5384d8c625f5115eeb539516c555c60865846f6cd726ac SHA512 c69280c0969ea28c0e2aeb1a840c08172c001f94287a689cd68c510212d185c04690fe082bd597113c3e74e65843f9a4499cee080083f58f24431880e42dab87 WHIRLPOOL f19c40a5346214d40f2c5cb328f5d840e85c9a6d42a19a6321bf7bf45fca6ee6c78f6a4af3fd6441fa2a4038b3a134a47861ac5800e16fef1f94bed41cef3fdf
 EBUILD xstow-1.0.0.ebuild 1384 SHA256 f8e4f5e77cc59b416133513a25f4081b3ec12e4514b37fcb40ca395c0a0c30ab SHA512 eebfcfdfa19597b4896d22e70529b59b9dbee84de8b8d8b614e465d95e553eb94577d5dd2f78775b102694fc72d0f9b72c951c660d56b4c8fa8f9022cd66bd48 WHIRLPOOL cd45e18132f22038b616a0367166720d0aa89d80c4498d0a828638750ac4a48d8889c13389b18851645cf3943334c99b7f39defdd5a1053f1ccf822a7940d262
-MISC ChangeLog 2119 SHA256 349a798d3ec41cf207eb7075c8a2a5364b68d64694e2f614120d15c973715af0 SHA512 03d6a6dd68a91400c95a9fa38546131c0bcc1f7da2e8eb091b67e071fb20fc974876992e423471551a77bd44838d4ea50b15b6d7dfaa4b5edd61036805dd918a WHIRLPOOL fc238efe610b83799a177126e0b0789920dc373980a5016f791de2a6f45ac563f2e6c7a622e6c37c2b450d4c001c0e51619f7e625871013a294b86c9c1b70053
+EBUILD xstow-1.0.1.ebuild 1389 SHA256 c82527ff65a2060c542dcba3e95cb9c5a2f03c340b2506a46a35811dede2363e SHA512 a5672f2376d67bc81aef5911137e074159808963273911185fd435e4d4f2a42a239f6a2c9ed2f22da9d8a02f12bb4d72935519efbd53168268a4cb2d3e72eb0c WHIRLPOOL 412b022ca17eb9a2160e2d22231658cab4a9abf6fbc4302030cc7391ee336c0d327bc10386dfb6597ccf0913f944500ccf502c324ae34f192a22df30ae71eadb
+MISC ChangeLog 2312 SHA256 b496cc76394fca6f0312a59507e69d12a33594e3e6e967f3a0c67ba3cf2cdf58 SHA512 af099a44376d1170208c96c72da5fc1375cffa036ef429e64febcc8b6c8b27882d470fadc952c772084aabab5d60ce81ab0bdf9011be12387e19015eae36aee7 WHIRLPOOL 3e66e28a329282afb04113b846fd06f338d985764c518ac50caa6ae9a5822d7688144a58f2c716432250d49091d11cc30d1c73d01fb24fc29f7522682e1140de
 MISC metadata.xml 455 SHA256 701b5ef876bdbda4a537ebfd08a88d1a520ddc18450e98c64dade05eed4ce6b0 SHA512 fdd8956c673afbe327edbfdddf869c370b1545c2b808135a67ba6e4d8f5dc89cbd09ae6ee2f5bb54bd8f6d38cddfc1bfb264cc9af40e123f5f63fb4fc061e273 WHIRLPOOL 68a4034fb743b5b8dcccdf51c96da08b6b7f381fd3340719912f1790eada5a6b842f9961464b0b64108ad518a65809844e35503f9638cad7a74188132a4f7408
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTMvnyAAoJEAmJmMX429reTpIH/3tvf2s2ySZb98KQ+kSh3V32
+MZtBFLO1oA/sfYZFk4hHgtSw7CJl7r2rxW41zApihEduR63GYJdsWt8MoMc8D4Jy
+sqbDedRDAu43MkiyZqxENMbxF5dA9o9MgQ8Y0FG/jQ3esndjgpO4848aWkpaU/gU
+iKHS0udPsoFtd74wJjbNhkwWNvu8wZdLjYsfutCxIbZ8Lw3/80KQgHGeuAndAk8y
+3V2OMTS+5OTash3qNt0QZaH4+r3cN/V9vFQiSn39lrEu5Th7P/WCH1FtPRrkINfv
+z0MNfCRQv+rRdxEHDJie6CDEnjBfPs55w0eOjkgG33wZqgOk1V78SU0BjBNR/GM=
+=wik0
+-----END PGP SIGNATURE-----
diff --git a/app-admin/xstow/files/99xstow b/app-admin/xstow/files/99xstow
index 2edcda2d8519..07625f392537 100644
--- a/app-admin/xstow/files/99xstow
+++ b/app-admin/xstow/files/99xstow
@@ -1,2 +1,3 @@
 LDPATH=/var/lib/lib
 PATH=/var/lib/bin
+MANPATH=/var/lib/share/man
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
new file mode 100644
index 000000000000..0355059f462e
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.1 2014/03/26 16:01:56 maksbotan Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="replacement for GNU stow with extensions"
+HOMEPAGE="http://xstow.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses static"
+
+DEPEND="ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	econf --disable-dependency-tracking\
+		$(use_with ncurses curses)\
+		$(use_enable static)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \
+		install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	# create new STOWDIR
+	dodir /var/lib/xstow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
+	elog "(regarding app-admin/stow, equally applicable to XStow) for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/bin."
+}