[gentoo-commits] dev/fordfrog:master commit in: dev-db/apache-solr-bin/

[Miroslav Šulc]

commit:     872279e6f861f8ad083beef5ab0f278cd5ad95b4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 08:29:35 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 08:29:35 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=872279e6

dev-db/apache-solr-bin: unbundled pdfbox

Package-Manager: portage-2.2.23

 dev-db/apache-solr-bin/Manifest                                        | 2 +-
 .../{apache-solr-bin-5.3.1.ebuild => apache-solr-bin-5.3.1-r1.ebuild}  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-db/apache-solr-bin/Manifest b/dev-db/apache-solr-bin/Manifest
index 0849b42..9c0699c 100644
--- a/dev-db/apache-solr-bin/Manifest
+++ b/dev-db/apache-solr-bin/Manifest
@@ -2,5 +2,5 @@ AUX initd 1161 SHA256 
78f08bb2490ef7263926db4c88148473bb21d73cc35a3b8954f63fe811
 AUX solr.confd 759 SHA256 
1c489c08b3d98b76cf702eb665301f34b16ed212e94e365d4b02e4a5cacbe425 SHA512 
c645a15063fda1c59e8069f6156c00751be419833c0bb93c320e1a776d42b63d9a25c2d4e399a59b5ef3ccba0d28845f7fa1251ac5adfff3866b54150bdfe0b1
 WHIRLPOOL 
06b85bbf0c9418725c4d57d1cb36a807f4f213b249c0395852f0c8374fcab93a778bb8bc5291ff93272a42b163fd0362469d795c4e8960310d19871822b16938
 AUX solr.initd 1581 SHA256 
bf74eb5460e4be217364680170623ad0682413942f840fac0a86455a7d067e3b SHA512 
1bf34345b0524d1a97cb615f01f9045268f09db92c56cb3015a9b6d9b6f119d207559cb60be0b10dfa88397213d6e9f8c3e02e99f68acea9ef6333c822dfb907
 WHIRLPOOL 
7a8d7f6f56112e1c37ecb80af1aacc0d66a95d590022aabcfd22bf0d269b04fbd813a0d572696e592e64c122c92e3564850ded6de1e4f3d20a707d5e6683d221
 DIST solr-5.3.1.tgz 134911094 SHA256 
34ddcac071226acd6974a392af7671f687990aa1f9eb4b181d533ca6dca6f42d SHA512 
e166698d2556abf9633c10bfc44739bc7faf29866e587406c97e9d4a3091b1a5f1ef485fa1c760865c21487255bc0b4219dbf7583ac2751f92a57fe46914bffb
 WHIRLPOOL 
1ce518b399fe55308c1c4b30c00d29e9f3bf3a0ab8555c247fb77e9f174bd19f46265a326ccf358007365f8713a70cfd4dd26ab17e5e352dc2982d8dac3d1791
-EBUILD apache-solr-bin-5.3.1.ebuild 14005 SHA256 
b5ec4457b7b246d0863dd4a8a73e5e4c4a775a37ee77b03c28c388ab82599e43 SHA512 
234dfa3c22c1a7e80bc6a57fa48397e8f437bb3b1395c7ee94b6d76ef1b9037393769492034ce46492cc51f8c16e2d5dc77e18893e1a34033ab3bc94e33f433f
 WHIRLPOOL 
20f8c9e3ca467ca613d10caba391a0e91b03e443f3f2592d0a76ff7f850c31960db0ceb1c10503883004339787023d8433c287aaac162992b2a08816577e07f9
+EBUILD apache-solr-bin-5.3.1-r1.ebuild 14125 SHA256 
37b2a410e18c153e84574b1228b7ffa50774167d30e7f9f48204abe597606a73 SHA512 
2338bd2deb48a7d1c770f8f8ff7138206057b811069703c6e4d7975550fb6353b3e6cb92acdf40934f5945bdf91800e6d8800c82b77514431096f5a33af3eed4
 WHIRLPOOL 
2cbd68cca49eb4756ae824f0722d44a5f4fef1a26b8cf2885ce80f71c89a167ee9b29d0205783757ad325b24736d350c5ac428e69041068ac2e72ea073b65e53
 MISC metadata.xml 338 SHA256 
079de59791ab66e210bff2a81bc6145dd0a9de153936023a6c67a27bc8e3a455 SHA512 
d2d381bc26c6d2d5e3abfce795631b79e6b4233686ea041dee0e61c87663367b0f0cd148a883a854e61be1f77c363e1c8bb46b34588e88828b18f68dc0ce2367
 WHIRLPOOL 
f4076d287727d0a6ac640d2ed0fda6b762360be6b75a16e1360b6cd5553ed6fe94102e64b3940e93e94426538f582118e6c89feaf2c7f2e23d610ade478d1e97

diff --git a/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild 
b/dev-db/apache-solr-bin/apache-solr-bin-5.3.1-r1.ebuild
similarity index 99%
rename from dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
rename to dev-db/apache-solr-bin/apache-solr-bin-5.3.1-r1.ebuild
index cbf828c..913831f 100644
--- a/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
+++ b/dev-db/apache-solr-bin/apache-solr-bin-5.3.1-r1.ebuild
@@ -53,6 +53,7 @@ RDEPEND=">=virtual/jre-1.7
                dev-java/icu4j:52
                dev-java/jdom:1.0
                dev-java/jempbox:1.7
+               dev-java/pdfbox:1.8
                dev-java/rome:0
                dev-java/saxon:9
                dev-java/sun-jaf:0
@@ -271,7 +272,7 @@ src_install() {
                # jmatio-1.0.jar
                # juniversalchardet-1.0.3.jar
                # metadata-extractor-2.6.2.jar - the one in tree too old
-               # pdfbox-1.8.8.jar
+               rm "${instdir}/pdfbox-1.8.8.jar" && java-pkg_jar-from --into 
"${instdir}" pdfbox-1.8 || die "failed to unbundle jar"
                # poi-ooxml-schemas-3.11.jar - the one in tree too old
                # poi-ooxml-3.11.jar - the one in tree too old
                # poi-scratchpad-3.11.jar - the one in tree too old