projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7fddd7b)
Fix the case of passing without-system-libs when using -java.
authorTomas Chvatal <scarabeus@gentoo.org>
Thu, 8 Sep 2011 12:33:26 +0000 (12:33 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Thu, 8 Sep 2011 12:33:26 +0000 (12:33 +0000)
Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/files/libreoffice-java.patch [new file with mode: 0644] patch | blob
app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild patch | blob | history
app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild patch | blob | history
app-office/libreoffice/libreoffice-9999-r1.ebuild patch | blob | history

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 31a4d9c41a458d7c35fa37e71dbea105f595425f..4414f3fc4f819e1a33474852b098de89c2bbda73 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.129 2011/09/06 13:07:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.130 2011/09/08 12:33:26 scarabeus Exp $
+
+  08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild, +files/libreoffice-java.patch:
+  Fix the case of passing without-system-libs when using -java.
 
   06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b2ec915926e027a0befb4489c9b01fa557214445..6ae7dea7494b2f7692164a7e572879acd85aa51f 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,6 +20,7 @@ AUX libreoffice-check-for-avx.patch 1973 RMD160 49ec33a7a230886e59658000ff0469bd
 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
 AUX libreoffice-honor-strip.patch 1110 RMD160 777e9da0265b9cb17ca124d55d55b26ff1c54b1e SHA1 8d0a10e3b0f6c12f996ec7191ca2a33e0d8be053 SHA256 9e85bb3a30a5ba3e1ee7441cd3965dc603ba33f02eb52857764498a5db08791d
 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81
+AUX libreoffice-java.patch 1879 RMD160 2a1a3ab82a9eb526d09beed577b98be24f485e33 SHA1 08f7d6c300e494ba9f056b941752419872d6d2cc SHA256 beab05671a22a685acf0a60bff8ed65deaa2b2ba79c79b6fcff59d87e2a7ecd4
 AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
@@ -170,25 +171,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18401 RMD160 987f42d5ef6017237dcd399ab0abf1d5fc9725ef SHA1 70e7de94a4c5fb6ca3c9e52433a2a5a5aefa11c5 SHA256 48a3cd1b90466bb2d822f89060ee4af52a4f84f859e9252f7994c8a34281a397
-EBUILD libreoffice-3.4.9999-r1.ebuild 18402 RMD160 0e2006f32e515250f1deffeb88f22b9d31bea3f7 SHA1 138f5bc17612a979006d26557e5416c680b3b11d SHA256 8aefee283e23fcbb21ae00812014f49a479b128ecbc35fe01d07ffb95b937fcf
-EBUILD libreoffice-9999-r1.ebuild 17710 RMD160 9c9620f10b31fb7d4482314183f5b4a1fc28ab42 SHA1 3cddc539b196bc8c9be9d3eab4d703d19dbb94c7 SHA256 697f380eec05833b322011b3ea1550e0faa31cc8b602893318e4547b761558d7
-MISC ChangeLog 25559 RMD160 13cd20a28935af8c77ae608d0b4853ce58b5e279 SHA1 34eea6f3f78dea67db3fca8566205e7d015583b1 SHA256 557c3980d3b2cc2100fcf76fe32dddd084ef50cebb8c5aea524e6e7866205d63
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
+EBUILD libreoffice-3.4.9999-r1.ebuild 18351 RMD160 d9c2102826919b44bf5a559502f245ac6a731b89 SHA1 f15fb2546e57bddd540947677b20ed0f105188b3 SHA256 aab9e1396604e9d3d10bbafa673e86e62c4fe8aac53f5cf9f100299ec0573df2
+EBUILD libreoffice-9999-r1.ebuild 17659 RMD160 12db205f32142f88dbda61f0e01836d7f324b4cb SHA1 23e4edc72bb53e93ecfdefc640ba3ae4952eb98e SHA256 fccb7c4ecdbe74b30cea431dfea6c6da8b30e4fc86ef931579a0854aae4ddefe
+MISC ChangeLog 25805 RMD160 4ae8ce56c75cb73c244e2935f1b75162424eba7d SHA1 9993de42930de3c6d36b274bc35afd8a6412547a SHA256 82e40f604e13ec7db9f9489d8c2aa0aae07e86bb5e216c38c6dfe18ace9e2301
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOZhs6AAoJEOSiRoyO7jvoCQUP/j1arpmdN4VusYeGGHNO4y7S
-ZP5/MaAH9+A4nJKsuCf4lKyg61SDrXz/UqZ03VDeTskDknI8nSwk0+jOm8z4KU9I
-UMC5tFlAIjRWmu1bCoN8Aw2qSbWrdkIE6TRBVEyB4YW+j3cQG2FyWiPQoNb8Efy2
-vtArZszsKi7xLHII2N4zFlN5YlnmxOmNRGKWzlz2H7R2nRvlL+WGT/nu1F2z/Z2m
-bZYSsklNqxjnqyhYu4D3lOLkhIBXdIXvot2XOwFKvq3h0C+qQ+EiwigaUQ5beDIE
-FAlKXy59pt81qX8NrgGvnlxOK6v0sBcQLAislTn78kYcrMk5nk7fami3EBfmefbL
-sNteKJZ+sHkrEEnD5qVkp7pLME3PTmCFheKdADKBNhxM7SwgUALX2Q4iatiDFwon
-6SwJA/N/Myuxpno8SFiCjEyjF3kw07enT1JAs3tYP8qUSsmMLiRfoRJE4aUaoDnD
-R/LwwSMbHlBPyF40GPk0/viEZsp0Kn3OSA3l0+2CBTMfZY2HwFtoCHwCZw3x3tr3
-6EiK3sIJiNbA/ZRh8aICNPsliX/GsWXNkZ7aZ6avIq7QnvGQnkmjhtAsgZ28BrEp
-ZhPze1IcAq47ajb+x+cj4dfqW8Eo3up6n7J7pydsttJnIcloPQMSzqqPu7+3Ng/C
-1zeB00yFxxw266YjtBwG
-=7wdg
+iQIcBAEBAgAGBQJOaLYpAAoJEOSiRoyO7jvoK3sP/3KQgEf3SnSibIS69RyQ35Zz
+85kLFxBS6KFmNLeEQWTgVhNbwm8UNkLT7xAjNyXLJEs3qSXh6j5g1svyCH8V338X
+uBC5YXLEMfR4KIXRsHYHeect+mNpY80f9FG01alzZS18Ophtj7GI2QXC4c2q7TGB
+TGBX7F+g10L84Krc5ZmpHCzofJMj8FE4N7iew7la1wfPwUKlwpCmNyXjLQoDKW20
+q8bV9VbcuCoKj3l3Jwi2MwCfREb1uaZvbKrsbhqpwbB2WYCKoqcBjeSu7/AAVFZT
+jGjSya3+yXdY3WFHMvZf8Ku6NMBf03SAFtpUtaMoeYf52/945Ihfmm4XU60QRMqn
+T1300JtKbBzK0ZuQRrZTq/q1fgfK3gc0hlTMW/j9TkpPhWp1UcD9FT47OdGa3QE5
+wUhXZWt210l0s2Cwzvw3xq4qVwM7XBOR3aODUP1LA3jsDmHLUAoClbb2ZdEH6qMy
+rhReop3IDl8eG+knYUdvZiajSOmNq44epGl8JFP00+/muHKbtUQmiIDXkmsW+32D
+boFjHz9LJ41uQnQjhg8FpjTu0GiTXAkk0udenc0C8uFWoSqHGY57ovo/G4XPeq5z
+nPk6KxDzMmbeh5s5wjmuZfHCvkJuN12uDb3kzHBnr2zAyTnQmdK8mo+EjO8UFM40
+ZkQi63a/+3W5HZ6D17Wm
+=MZdl
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-java.patch b/app-office/libreoffice/files/libreoffice-java.patch
new file mode 100644 (file)
index 0000000..ac5b394
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-java.patch
@@ -0,0 +1,52 @@
+diff --git a/configure.in b/configure.in
+index 1dc00d4..262fe00 100755
+--- a/configure.in
++++ b/configure.in
+@@ -4962,6 +4962,7 @@ AC_SUBST(DB_CPPLIB)
+ dnl ===================================================================
+ dnl Check for system lucene
+ dnl ===================================================================
++if test "$with_java" != "no"; then
+ AC_MSG_CHECKING([which lucene to use])
+ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
+         test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
+@@ -5021,6 +5022,7 @@ else
+     SYSTEM_LUCENE=NO
+     BUILD_TYPE="$BUILD_TYPE LUCENE"
+ fi
++fi
+ AC_SUBST(SYSTEM_LUCENE)
+ AC_SUBST(LUCENE_CORE_JAR)
+ AC_SUBST(LUCENE_ANALYZERS_JAR)
+@@ -5189,6 +5191,7 @@ AC_SUBST(HSQLDB_JAR)
+ dnl ===================================================================
+ dnl Check for system beanshell
+ dnl ===================================================================
++if test "$with_java" != "no"; then
+ AC_MSG_CHECKING([which beanshell to use])
+ if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
+        test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
+@@ -5204,6 +5207,7 @@ else
+     SYSTEM_BSH=NO
+     BUILD_TYPE="$BUILD_TYPE BSH"
+ fi
++fi
+ AC_SUBST(SYSTEM_BSH)
+ AC_SUBST(BSH_JAR)
+ 
+@@ -5211,6 +5215,7 @@ AC_SUBST(BSH_JAR)
+ dnl ===================================================================
+ dnl Check for system saxon
+ dnl ===================================================================
++if test "$with_java" != "no"; then
+ AC_MSG_CHECKING([which saxon to use])
+ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
+        test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
+@@ -5310,6 +5315,7 @@ else
+     SYSTEM_SAXON=NO
+     NEED_SAXON=TRUE
+ fi
++fi
+ AC_SUBST(SYSTEM_SAXON)
+ AC_SUBST(SAXON_JAR)
+ 
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index cf6faf4fbfb0b6d568b293ab048d6237ca2215de..f8b3c46341cf5b14402aa792cfa3568c08eaa7dc 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.6 2011/09/06 13:07:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.7 2011/09/08 12:33:26 scarabeus Exp $
 
 EAPI=3
 
@@ -227,6 +227,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
        "${FILESDIR}/${PN}-kill-cppunit.patch"
        "${FILESDIR}/${PN}-honor-strip.patch"
+       "${FILESDIR}/${PN}-java.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -389,9 +390,6 @@ src_configure() {
        # as internal libraries.
        if ! use java; then
                internal_libs+="
-                       --without-system-beanshell
-                       --without-system-lucene
-                       --without-system-saxon
                        --without-junit
                "
        else
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 53d7c26eda289275c435f6d837d94493e3dec1e8..7a7d3ba4eafe6bff6cdf97bf07ce36b10a243f8e 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.6 2011/09/06 13:07:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.7 2011/09/08 12:33:26 scarabeus Exp $
 
 EAPI=3
 
@@ -227,6 +227,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
        "${FILESDIR}/${PN}-kill-cppunit.patch"
        "${FILESDIR}/${PN}-honor-strip.patch"
+       "${FILESDIR}/${PN}-java.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -389,9 +390,6 @@ src_configure() {
        # as internal libraries.
        if ! use java; then
                internal_libs+="
-                       --without-system-beanshell
-                       --without-system-lucene
-                       --without-system-saxon
                        --without-junit
                "
        else
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index cc3a1f03209135c451703cce0b0d21fa16d19bb4..abe8a8afe9bb44ceb9b2c1c0bc2a8e3071ca0fc7 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.5 2011/09/05 17:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.6 2011/09/08 12:33:26 scarabeus Exp $
 
 EAPI=3
 
@@ -217,6 +217,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-installed-files-permissions.patch"
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
        "${FILESDIR}/${PN}-kill-cppunit.patch"
+       "${FILESDIR}/${PN}-java.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -379,9 +380,6 @@ src_configure() {
        # as internal libraries.
        if ! use java; then
                internal_libs+="
-                       --without-system-beanshell
-                       --without-system-lucene
-                       --without-system-saxon
                        --without-junit
                "
        else
Unnamed repository; edit this file 'description' to name the repository.