Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix bug 553392.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 41 insertions, 19 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 40a498452b87..f5c91bfc8f72 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.73 2015/06/26 23:09:14 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.74 2015/06/27 13:04:00 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix
+  bug 553392.
 
   27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
   Slot version 2.0 as it should.
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 752d5e8271e6..cd140d53295a 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -6,17 +6,17 @@ DIST fop-1.1-src.zip 27577477 SHA256 0886058bcb076899d9c46f65491eaa9b7144c1c6324
 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
 EBUILD fop-0.95.ebuild 3593 SHA256 7bf4dce4d8ae354898f501c562b3bfc414e745370932c26d77b3f57b280cb74e SHA512 bcf51ee7e636b2fa205b500d7c12bfaee515f3d0f48aa6ab6430ac6eec3b1678b717498b1bd716f1e36495015fc207b759dda86d2bb37728a584f5b99bf2ed07 WHIRLPOOL 4cc1c97e7df37138bebbf7e555cd4b24e70792f5aa66c778b137c014bc747c50d8e85896787a78b5d5f6d87a16d1bf1326e057a6d22e703057714bced635ac92
 EBUILD fop-1.1.ebuild 2871 SHA256 add24441393c6f689174a19dbf7ccb0add48861342aac2b77c89f6b4750ffdee SHA512 036957655d1c392c9bec7b1c0201250aae0d50a7f1e92b8837ea241cf760ab6f2f1f6eef360db14d74af9582242c0839fd338262862060277fa395f18c37052a WHIRLPOOL 6346d77c829c8ba4d41b8ebead585075d064ae377ba09e903041ec1f14d69a6c475c1a7fdb745fe8411e45aed9b8b41ddd7b6601b4563048671809c10fc6b20e
-EBUILD fop-2.0.ebuild 3007 SHA256 b5b3ab0e0393530ddc0f9d39bf4e0fcf5c55bf8d83acb330ca3c523036e0bee1 SHA512 7887909fd2f7c355a4c480331a2be3982806ef45d71a4e4abf52caf767f09ca9ad6cfdf51bedde03fad50bb853165737e1cfe27e9ad5220eeacd90c29df01ffd WHIRLPOOL d871bd8191a81c743ac020810cfde2746f20846990f7837ef379c6d3d509bacd38eb531990c751dd98029306339d3ef884ea0945cb06a89ccaa80fb0b17ab3fa
-MISC ChangeLog 9385 SHA256 14a85f7ffdd02d2917fcdd06709bc5cc987ef46586ea528cddf95d27f9d2a173 SHA512 56383134fbe516030c9d73b34c3f2577705eefab893291b402847b22ac0be4ab4e791126eb2a26112f34bc25f06eaba655359352aea6887b48ea58ca24dbc26e WHIRLPOOL 1bc67ca88bb796a87052738bfbb01166c3c067c9703c2cac9496e0ca9eeddf4144ff549448fe6768132d6e5c524130ddd7d7fbbb0e2e831faf493c9f7ed68edb
+EBUILD fop-2.0.ebuild 3086 SHA256 58cdce5cbefabeae9487b663f08b9d9ef4808ceda859470a19dabc35b2d0b0a4 SHA512 8236901b8cc25ae97355e3dd2ae068226a7f216fa2f02c96a2703b95be745dc6d0da6b5162236814514e83e9c2cb7a40dbdfcdeadd88e30611320297af76219c WHIRLPOOL c8b3e004ed463806cadc43f901c3c5ff5376c672d76f84f62d7cf37e4ba9038e04eb64bb8b394a36b1e5c7e1e76554e6abbc025b61a9834a7cb9b5f74785d00c
+MISC ChangeLog 9551 SHA256 e38da7a2a129ea9339c1def3f170aa690631ac3b1eb007714fa091bdfadded8a SHA512 622c9e338320c27480e5e411c8901b2fce46d87e46b13bc62f8d3b6206f787fc2209615985b5f72280eb55b0a33ea39ccac549ad821c44f0453c14548f7e900c WHIRLPOOL b8dbc4a3a19177bcce566675a75d88ce4c5190947140ecd4dd6ede75769d8b82074143fb4253966a5f51991ab85f850cbf6142e57bd9ae3bb235dc7ef4acc25a
 MISC metadata.xml 427 SHA256 0b6fb333d87a73eff05b69a66715578f1853ed64584307dcaee983ea627af25a SHA512 8159585ad34a54a6d67ffe9e6803befbc2eae42ecde0c03f450c7f877675b0ddee4805c43a6aeec9df8e1e05329b1b7f08ccea836fb90025623fabd4a2d14778 WHIRLPOOL 386b9e1d7460698bce806b89fb65a029aef49a6bc050fd289d3c5ae48f65502eb3d70d107f3a7099ed04fa78cd5bd686912563ce616dc321654edaa767c83ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVjeoLAAoJEJGRpfGTSRu42LgH/Rb7AcG1v+p4jUNWtSqzzJcg
-8kijnh3tnpwPwNmlyBai03RCny+FEExSo5EXWeiA9YZz3/nCjzUZBbWV1tcKn6KG
-mnGA6dlaSNfh9AImjPh0nYvpO20QfeaiTy/hdBLZVYTgKFfd4Z5qUFjZYpDKqUHw
-a4ac3i55fWX6n30BYOoF6fRS66hVeZljSiFj89TfCdLgjA6FYoUeum1v3byucBC7
-mifJ0E3xqeNh3Cu0OhPr6svHo+9qBb+A/SC9cZpVnBhyZTghv8aaftsTX9FJBLOd
-Bc0e0OkYxjac7ONYo87FjnBkFq//oGMvQljagbCMrKXGtk7V88dsa2Tm2ovwUjE=
-=pU4G
+iQEcBAEBCAAGBQJVjq2uAAoJEJGRpfGTSRu47FoH/j9KIwuO95yim38o6OiqJPrs
+9E3pEEflqJzongqqxL5TX+l/yqTFTvgkPtbqSG7oMCvfXq6QrmNjrxgpIgL2KsSx
+0H+IGgBRUOLq9sy1SdJmQuvbCwR1Kh42pRECZ9O36QcnAX2S8GNDE2tNV++kPNxo
+BN2NvuYY4c4LyCpJZufTiuXWgdQpbfbVDkhBVK+7z2nx2XgieVY9jsIgzMtAClAE
+41iHtFL8FUYn0WIW2kRsK9Ca9Fz266npDUkZQeeQeP4ORnbx83ieDvCJh4cv0M5f
+MERC4r0ABXBEgJJp07U2QyKx0tEuXCDjDvXbVtOxnyk9W9lO3lqvaLkXlE0yoSA=
+=nMOR
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild
index 5f96367ff6d9..b78e8297326f 100644
--- a/dev-java/fop/fop-2.0.ebuild
+++ b/dev-java/fop/fop-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.2 2015/06/26 23:09:14 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.3 2015/06/27 13:04:00 monsieurp Exp $
 
 # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
 #       be built as it needs forrest which we do not have
@@ -85,8 +85,14 @@ EANT_TEST_TARGET="junit"
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)"
 
-	use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=",sun-jai-bin"
-	use hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+	if use jai; then
+		EANT_EXTRA_ARGS+=" -Djai.present=true"
+		EANT_GENTOO_CLASSPATH+=" sun-jai-bin"
+	fi
+
+	if use hyphenation; then
+		EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+	fi
 
 	java-pkg-2_src_compile
 }
@@ -100,18 +106,30 @@ src_test() {
 src_install() {
 	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
 
-	if use hyphenation ; then
+	if use hyphenation; then
 		java-pkg_dojar build/fop-hyph.jar
-		insinto /usr/share/${PN}/
+		insinto /usr/share/${P}/
 		doins -r hyph
 	fi
 
 	# Doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+	java-pkg_dolauncher ${P} --main org.apache.fop.cli.Main
 
 	dodoc NOTICE README
 
-	use doc && java-pkg_dojavadoc build/javadocs
-	use examples && java-pkg_doexamples examples/* conf
-	use source && java-pkg_dosrc src/java/org src/sandbox/org
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
 }