diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-03 09:28:24 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-03 09:28:24 +0000 |
| commit | 5c36e781742e89a42d2c9565eaf55fdb4259142b (patch) | |
| tree | 6bcbc0c4c9b6eef2dc150bb8a3d9d02e014b5bed /app-office | |
| parent | Version bump. (diff) | |
| download | historical-5c36e781742e89a42d2c9565eaf55fdb4259142b.tar.gz historical-5c36e781742e89a42d2c9565eaf55fdb4259142b.tar.bz2 historical-5c36e781742e89a42d2c9565eaf55fdb4259142b.zip | |
Do not bother with binfilter if the useflag is not enabled.
Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r1.ebuild | 11 |
3 files changed, 29 insertions, 18 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2e1b96ee145f..f40c874fe20c 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.160 2011/10/03 08:58:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.161 2011/10/03 09:28:24 scarabeus Exp $ + + 03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-9999-r1.ebuild: + Do not bother with binfilter if the useflag is not enabled. 03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 75cf4ca3737e..2b6e46a8bb33 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0 EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1 EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7 EBUILD libreoffice-3.4.9999-r1.ebuild 16078 RMD160 e296524c64209e00a4fbdeefd022eaef87b4eabd SHA1 6f82a057952733af6a7762b9a0cd61b46212ec90 SHA256 44246714d937e8cedf3e78109fa69484099d07bbcab6f1c76e3125d00087fa3f -EBUILD libreoffice-9999-r1.ebuild 14125 RMD160 64701a9bf0d46b280729945b3324ddb76f61f443 SHA1 1f7eb74c71f291d9bb8e2ff7cda50310b980bd2b SHA256 c04bb5541afb8716a98e14c2418e35a3404bd8ef9242f6d9dd47d2e33cd2fb85 -MISC ChangeLog 30093 RMD160 517f014adb045f82ad2ebc85cd1a0f07cdbdf3f3 SHA1 0a807041c5027b0feeecc714777cf52e8586fd5c SHA256 a4eeb36fef9d5b51ee2d41eae23cb328dbf6d30faf310188cd58d8a0f510f195 +EBUILD libreoffice-9999-r1.ebuild 14317 RMD160 bedb5021a15e7de0f365b7e7633c6418c6ffaf7b SHA1 ab4fe77e13610be24d68bc34c0628dd6b96a2412 SHA256 660b8a9e729c93fd2e70e30fd468ff8c451d5597fdfb8595ed57b8385ca31bcd +MISC ChangeLog 30241 RMD160 88627c0d7f08b5fd67a495052ce83065a36cf83c SHA1 587c088d599c57fb36dc14c95fe51a5d436a6243 SHA256 2ef657a6d3bb0ec45f57ce05615e9099b288e6acf2346705234873a8bec8ffe9 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOiXkLAAoJEOSiRoyO7jvo9EkQAKUtAqxgSvQ6+nVHq7a7H/tB -JASsMj1jXvcNog/HzHrXGZDsMuqqREwHiXDT9D1uM8uerGIwf2lzXH0bykTIzaYx -wF6TJrEcyatuy0bl+5+r8z2Ih87y6K6grep7ycYoRKMozU5R37k1S/fusy6WaRmo -EEiG3DiAGXFOR24qJFkcTRxO2UKoeGA3XVvTuYvn40DcXKDhOhy/pyeC67vHUQ9c -+8m/r4IkRsuG/aDo1xqc8ykEGOyjK8h9ayDrvUZs4S9C1PRt/Z9YieGdLzwFnQkE -mP63gT1NsNpSIPt5+NI2RYj/XaD3xznC6B/EAL9VSOzeG2lg+YdJKAJm5M68xVKw -+aBDqnXQWzQylxOpCn4L9lWD9LWD2+mxZPUTaCmQBKny+dwZZ9zM3/l0CodIzMOd -m0+MXm6UTn3t69MSiMJLzypQ8oSZMzUgPIIsLI71Y5VjoTD9/MTjiMJVK4L0NBjD -pSReFxgEpay3275peZUNA6L01Yn69uNS1ojTQal8VsFsnr0L8W7rUpuKP91yKFWA -EgWTgy/0yt+XF3PPBq0ORmZSoB4oDhd9SaONQ78Fr6CadtKxYgIwst/VsiqB3FIu -A22edgUcJyBQwbAeoHaGvsqjZPm+YLO7QXm8wEKm/tl+iPr+kJTyYWKDssFtYDU/ -tUFhnt5EzyutrhIoqtkG -=kMAV +iQIcBAEBAgAGBQJOiYCcAAoJEOSiRoyO7jvoUucQAKQK884jh1Q91AviBRgD4i9n +5CsY+O9jZ+1cCS1rPcgVsXXKncEczNwyA89MIm0WkPAWkouEvIg6oyeKeAMY8jrH +psh/BRV6KIW3xIb2NGdhKe29r0ifbmNfMxEdSnMQs7aiaRLIWxxNhTW4HpYZezLc +nQ02gtv9bsSNl3T2IR+24iwS/U8UZyK/PQDnMO11KQvt+CkYOZ6EnoXtxGQpboeE +8v9WPn+RgzSbh+0dY4IexTEhWZxCaozo5UOo/0qiedGC+1GIkxQspBpA4PmfyuLe +RZ0zv08VZkfwlBaFUsMKeqTrVuT56tvUK8QNTrmilO2JmHGCfTM3n9lrpkeBlkGY +/sYXywvWgxF3RcweXm9tsq5ycUlkO6NjBA2aOiPOcFrjjTarqPRiMr2WzV1pDXdk +cLd+nVsZJwcJueCbkvLRVf3q937iGJNeo1bH88k87ANBKeyXhQkXBk0CdBjHIrEq +pGL1ZaCA1zvy2ztggDo1eZk1q4THFLTr1urvYuyXDqzltT5DGNE4ZW7LcnKNQC9J +Y3w2kCiRV2CYW6VcwR59ZOk0O74CuiJfDZQ+LbISJ8Wm+Sope9gcoXYwVlBlZwDA +jMkpuEbg5Lw1AtnrlQD/UFg9p1mrx6dzJAvjJBrvaRp8D55/d0coafhiOtValk+S +d2pl9bt0+BEIFiziVqsY +=oyHq -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index c2776e265c30..143b581373ff 100644 --- 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.32 2011/10/03 08:58:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.33 2011/10/03 09:28:24 scarabeus Exp $ EAPI=3 @@ -39,7 +39,11 @@ MODULES="core binfilter dictionaries help" if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do for mod in ${MODULES}; do - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2" + if [[ ${mod} == binfilter ]]; then + SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.bz2 )" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2" + fi done unset mod done @@ -242,6 +246,9 @@ src_unpack() { done else for mod in ${MODULES}; do + if [[ ${mod} == binfilter ]] && ! use binfilter; then + continue + fi mypv=${PV/.9999} [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" EGIT_PROJECT="${PN}/${mod}" |