added prefix support (bug #427976)

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

3 files changed, 37 insertions, 18 deletions

diff --git a/dev-tex/latex2html/ChangeLog b/dev-tex/latex2html/ChangeLog
index 4645c0a62b78..2503e46c9184 100644
--- a/dev-tex/latex2html/ChangeLog
+++ b/dev-tex/latex2html/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tex/latex2html
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.53 2011/02/25 13:56:46 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.54 2012/07/25 14:14:24 ottxor Exp $
+
+  25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> latex2html-2008-r1.ebuild:
+  added prefix support (bug #427976)
 
 *latex2html-2008-r1 (25 Feb 2011)
 
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 339320125d6e..63aee9528538 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX latex2html-convert-length.patch 1148 SHA256 aaf0e7b7ef3e37790da12fac5e92d87323c6f8041d7fd3c205ee3c96df83401e SHA512 f5bb3c29006e783728915d0761cbae4b0fddd65aa323749f9459ccf439d6896fd96c3608c2984868bb82be2ff390a6fe39933f01d3b12c94d50d61824f6368e1 WHIRLPOOL 2439ff81a4cbe30690dfb70f06ea05fb52652b1a93f9b7ae13d01dc9001ac0a9efc2075c7a26c9e591f44f6affada83a9b20a195ea3a4481584d3f9bce1f683c
 AUX latex2html-destdir.patch 703 SHA256 e2dad7784064b12c17ba9530eb54f706d057c5b399538ee1928ca38005f860e1 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744 WHIRLPOOL 08d3e7d0083f9b2039dfb6798b73a64045ac7c0ad19b240c1be0f46e39f611380b056fd181ce55814999f36bd2f1ff415ded96a1a98e4659b3ba7fa343edc1a8
 AUX latex2html-extract-major-version-2.patch 640 SHA256 2853223713f4c4f3b3497cbee98904299442947ede5c35d9cdffe43b1fb6e12f SHA512 924fc8212250b20a4dea15e9588376d067740966174268e10922edb59da8be6f5095411570f06610593e5c0ffe54d3340e10a6f8050f4966ba29dbf5c12f3dc9 WHIRLPOOL 314709ea1efd6d3805c64ef6f582a8a6167dd93f8712842694d6ca27c9fe4234a65deaf09a3be1360eea4e1b6f1aac75e856f20ee2aae53cf1cfb0e31ab590c0
@@ -5,7 +8,18 @@ AUX latex2html-extract-major-version.patch 635 SHA256 265327a28fdbec750a32fc3299
 AUX latex2html-perl_name.patch 445 SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9 SHA512 2f20147e0c4c5818f1e3843e3f7176ce84d332d2b3f3266cf86e4b4432c72ce626110805613b5f8f9f72b44332a532a203d1e4b091f9b447ec1bfda23585b6db WHIRLPOOL f4b3baa4276b2c0b8d5c854547816c12836d4d93ca9fc09e456fbdb53c58233dbcf83bc85ca1cf550fdf6063e0345c5a20559aef00d6c763b7a53d3bf3709414
 DIST latex2html-2008.tar.gz 1133054 SHA256 59456815a3984250c295d3d5c46b85646038db8db2735cdc0d3780cf4da337ad SHA512 e5a9d1700fcc45e6fcb7bae79e25acd52b7a84b70a75b3c7f1e746f65adbd48219a828420f6a7c437613d5c74dfb0405c91df01ac9c1535e9850f3a3e5c47f60 WHIRLPOOL 3d4dba64a2ce1b548749f5a5d489afba8694b2b6214dc5b7030820898d13a33dd708c751d2dc625a3d93930bcc0e483fa3e6736a2812c3baf395f70bb77404dc
 DIST latex2html-match-multiline.patch.bz2 8147 SHA256 fa4c74b1e6ef3fc337485b7940922aaa1aed0c33a533e75f4a97503547f4570e SHA512 01ec0dd1705f030736432a7fa8bf99c83c9e4f01c9755319d36e65e18737361d23073277692a8c44af529a1c37caabcc9e720a4be57e64300f945060e88f6641 WHIRLPOOL d0f69d16060d9829cafdc266acdb50e2071cf742841e7fcce524d69268c51036665670c0e3111e83dea8271cb0032f2362686c976a8b2c9032b50125ab3a9b2c
-EBUILD latex2html-2008-r1.ebuild 2574 SHA256 752963dc96ad7a1ecb7b1560f4e297e48a58a4e306e3a84c8045888da09b3bbb SHA512 21f748e716413240e2d74ccfc7a6fa4be1d5050175ccb0daa1206724010621ccf63f0b5066f4d077345c6243edaba575170cd1c79ab40b3dd9c6c5f175b59b14 WHIRLPOOL b6d892a61b844cb16328640eb28a656c6c491185f8fa23e81c2e061583da10de50ebb03efdb4f683cc45ba03535c3487895a5fc1b33d165f149817b7860e8af0
+EBUILD latex2html-2008-r1.ebuild 2801 SHA256 61ee29f78dad982bbb61ae0c3668d61a0eddfd9417225fd10e196ba6e51adca2 SHA512 153b7ae03b7ce7a4ceb0d71e9d1527b4bb49d95962e3714598216721a056508e74f07b6bdafdb487c88e8167737c1459bb054d37cc10d25ac04110860e01f640 WHIRLPOOL e3ea50aff5b726a0cba413499bfdb777ec705cb770129d0cdce059f0dbd1b917b79125284585092e0b68968a69d74f6478c39ee346f1e3b71027844ecd0cd13b
 EBUILD latex2html-2008.ebuild 2487 SHA256 0035339821254b0418e9daeb10c38bcedbd1570a5ae355828d747e2adad2c1b3 SHA512 1dd86ac2970a1481fa6d1efb6fff5c5b6aa96e56517b5708a8fce314c703fc0355ff4bb02d86de47a01f97f55eaa414e2f5df3c14d53e5eea6137dbbbab3e9f9 WHIRLPOOL 04fd5165164a8dc9f2e6ee8eb954f28df0b2e4c6cb85ff195d44158b34e4fc16fae8f5ba4859904a3f01f2de4c719b00d6be58d44c6ee9e3fc21ee4896b822b7
-MISC ChangeLog 9529 SHA256 0024e89c46c60e6708336aaeda41378837018c92c85d1add63e8e5669e80c999 SHA512 9d55bf94c35ece2e3ac88ec5f6298ec478284c560d576aa803f4031ed180406fff537cd011305c77c8760c2a684dc443329debd60ed18815c48139fbb597ec35 WHIRLPOOL 46062e2a408798271e640a019c60be940b0803684b9afb4c08a98636a61c0b75c7fc7d5a938a60e90c23e693ced9e8da9b8594dee022808c929f79335ae9a57d
+MISC ChangeLog 9645 SHA256 d7f6fb1fb58484c059cd5ff127ba1b60b616e21ef9def23f461991452201f0c4 SHA512 551e4c1aa302a06f005840d560212ba274f613c3f2b63159e5a61828d08c9dcf8ae9acab2ad6bef25e820ed96b874998edfda651c6ec51f0dd806163bd5e7709 WHIRLPOOL f43ef55f739795826859341488558320ff06000ba990add09e1af72cf33e78f8d1e5429ed473e1fd06195c24df0f8320c64279a39e7b84b5427d2c56b28aae22
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQD/9GAAoJEOeBhlrCAAWGG4QH/00hH9H7gYY+DKUlHOxj5vvU
+JGEZF0KAZZ/WrfiHPao5hcHHE15uv1Xv378mYqyIytEMIQH6OYni6NmDQM63N5zd
+ajbfEJD5+SV9RIlU3x7QYDsJqko9mN3jbhROc49c01zydRYQGKunCqX/Vr1CQA7X
+sF3A8yiprn3yCyCnXbbuP1OK6dEeR7I5URf7TbVqKb+LUztsr7EwWRbbVVkmFtKX
+DdbyzCjQMHWoSvbNZPraP/VK6PQ1z0zACcOaCvhyOty5XVAVtmK9IgAUaAXk7R09
+Vo7uMgKNHfxRTGdgQ7F1cXi/E08htYokT0SFmDpVY1XVXNK1GJLz/RV5HbiSue0=
+=QDDG
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/latex2html/latex2html-2008-r1.ebuild b/dev-tex/latex2html/latex2html-2008-r1.ebuild
index 3098d8265833..cd50966370d6 100644
--- a/dev-tex/latex2html/latex2html-2008-r1.ebuild
+++ b/dev-tex/latex2html/latex2html-2008-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2008-r1.ebuild,v 1.1 2011/02/25 13:56:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2008-r1.ebuild,v 1.2 2012/07/25 14:14:24 ottxor Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.latex2html.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="app-text/ghostscript-gpl
@@ -33,6 +33,8 @@ src_prepare() {
 	# Dont install old url.sty and other files
 	# Bug #240980
 	rm -f texinputs/url.sty texinputs/latin9.def || die "failed to remove duplicate latex files"
+
+	sed -ie 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
 }
 
 src_configure() {
@@ -40,15 +42,15 @@ src_configure() {
 
 	use gif || use png || myconf="${myconf} --disable-images"
 
-	econf --libdir=/usr/$(get_libdir)/latex2html \
-		--shlibdir=/usr/$(get_libdir)/latex2html \
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
 		--enable-pk \
 		--enable-eps \
 		--enable-reverse \
 		--enable-pipes \
 		--enable-paths \
 		--enable-wrapper \
-		--with-texpath=/usr/share/texmf-site/tex/latex/html \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
 		--without-mktexlsr \
 		$(use_enable gif) \
 		$(use_enable png) \
@@ -66,18 +68,18 @@ src_install() {
 	# clean the perl scripts up to remove references to the sandbox
 	einfo "fixing sandbox references"
 	# pstoimg isn't built unless gif or png useflags are enabled
-	{ use png || use gif ; } && sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/pstoimg.pl"
-	sed -i -e "s:${S}::g" "${D}/usr/$(get_libdir)/latex2html/latex2html.pl" || die
-	sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/cfgcache.pm" || die
-	sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/l2hconf.pm" || die
+	{ use png || use gif ; } && sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/pstoimg.pl"
+	sed -i -e "s:${S}::g" "${ED}/usr/$(get_libdir)/latex2html/latex2html.pl" || die
+	sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/cfgcache.pm" || die
+	sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/l2hconf.pm" || die
 }
 
 pkg_postinst() {
-	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
-	"${ROOT}"usr/bin/mktexlsr
+	einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${EROOT}"usr/bin/mktexlsr
 }
 
 pkg_postrm() {
-	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
-	"${ROOT}"usr/bin/mktexlsr
+	einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${EROOT}"usr/bin/mktexlsr
 }