Revision bump for versions without templates. This sovles binpkgs for the sabayon.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 998ba1c8fbba34fd5fb899f91c932c7d89dd54b4..803ba912ae59270eb4de5d1097173568a8c781c7 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,15 @@
 # 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.197 2011/11/11 14:54:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.198 2011/11/12 12:32:14 scarabeus Exp $
+
+*libreoffice-9999-r2 (12 Nov 2011)
+*libreoffice-3.4.9999-r2 (12 Nov 2011)
+
+  12 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-3.4.9999-r1.ebuild, +libreoffice-3.4.9999-r2.ebuild,
+  -libreoffice-9999-r1.ebuild, +libreoffice-9999-r2.ebuild:
+  Revision bump for versions without templates. This sovles binpkgs for the
+  sabayon.
 
   11 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 36d2c5d890f3d8497f7c74bda562bf9d3b3e96c6..780802a80806bf7c4edceba0e164892403616237 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -174,24 +174,24 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b73340d2c9 SHA1 4ba8289141748a37763049aad453ce8cde277e1b SHA256 7da90f1704e492c9ea60982283868860d96ab7550e7cb6a5806858d68fa15b98
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16537 RMD160 859a610da9e697a9e5b7832108f3f57dc9145d33 SHA1 0be702423727887cb1b42b3157766c0235fa03b5 SHA256 fe8abb5d7a09586e76f5181064f0d88ad91814db459084b332adbff4e80694d8
-EBUILD libreoffice-3.4.9999-r1.ebuild 16561 RMD160 d29d090c711bfd6b4cfc6ecfdb7c410c0e0df0d4 SHA1 1df0d0fc1912e9763d51494e0da2032a0ce4d2d1 SHA256 e4fab488961d4691bcfdab124c642f1bd99c030ea8dda87d2637e5edbb5f5407
-EBUILD libreoffice-9999-r1.ebuild 14964 RMD160 c01d614daf751ee6a058b56e4a542d5088642204 SHA1 d4e915afba3dc1981a6fbe73519db76b35320b53 SHA256 46d8cd41c7c58bac6b102890f47b76da2346e9b38df309313b55f1090b7c9d74
-MISC ChangeLog 36442 RMD160 547ef460c894060b040f571009aaa42aad6763dc SHA1 747e6f8b11a32be7560e47f07e1acf1b80041ec6 SHA256 7b08b8a9019bb651208873c3b19f29414009ea18b54b94212c10ed9c904053e6
+EBUILD libreoffice-3.4.9999-r2.ebuild 15026 RMD160 8d20c6104f2e9f80c6a92967591b0cbd56230997 SHA1 a970c49517e7421db3a238f94feb18b62bda28b2 SHA256 db95e3f8a7bcb9ade0b2b58acdc0591b77eabf223c61c4f99c72a95553b8e53a
+EBUILD libreoffice-9999-r2.ebuild 13389 RMD160 6e4d7d0f1010225abbe6db0830051d3001a30a97 SHA1 d8d8b59986c97614fea6f13b6f25270461c83583 SHA256 481998f3fd625dc9e757728d2c5e8369d44a747ea79e8b259a8db08004371b08
+MISC ChangeLog 36788 RMD160 fb06c4552fe034748f2f022f7d21040d4a1f4600 SHA1 18b3dfb9c25216562fc020404d3893bef36d1ff6 SHA256 061857188f2565ab16730d1b204cac157c4f6549dc17f36fc12dbd4c3c0d3d5f
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOvTe6AAoJEOSiRoyO7jvoEnkP/3mTfsHBBvHNgu+CbWEM+vry
-dCM7KESRfy0K3q+DhGu4XKogkgm2mAuRUCtdc72J7pJwh2B2ILmzq52mVRJQgW04
-HhMfEgBXvrnt4AeFmuPUkmDkE08K0H5m7r0+82S3uHpo1Kva+7X6tfiostFbThjt
-dY+0odoqxNstaPNa30CZn3/64MoaGNQr6cvsdIo5UkQSxhyr3+iSyLSz9g3JOjPE
-X3ktPf4HBC/vuL867d1NsHPQrZAzAXpqq0LEBGyCjptW/MleBM5dMylqgDyzLJmL
-qEg5NJPyd1cOs4x68xBQfztoblkQWYliaStGz4p21VMVbZDLVYtqyA/BKtVZt4Ou
-rgkZasgsYldcy5NXDCUntGuN2uvuvZiRP7nuQtGGh/ODGVnntHxKNfoNErDXj3P0
-iHOjbKZk2opV7BKt8f3GXGdU5Y3dZZ7VtyMouGsJu4154UhzcsUlDZEiq8Sdgu65
-0YJBcfTySY9M9wbGjGfws3j1WBhsQ0ygkPAj2s6+ILtmPMLdjLjOarLq0hMtlzZ2
-Y32JWaWZHzS6aJjqn/XGvwZQImfhS0qguGg3J5ogG8mRs9b+4UEQjBVSzZqIK3yl
-llX3rkyN8hzwkH4yCFCz9Oif6TMqdd2zIS6egaQl85KUJprSdSlik3UKWfOXO8lp
-bXCX/lfZhSYDwkAXmMJ8
-=0I7Z
+iQIcBAEBAgAGBQJOvmdIAAoJEOSiRoyO7jvoAdYP/3oTsRbnbLK6LpySXFhA+MEV
+n4N6eE27G2cp86pHFpNOQrJuHOF4hzokVG38pqzDInAnxxCm2wmC6ecpNQYxTjnx
+SCx8qzhWVj0KwaS1HIm/Cgv+LuveTMk39u68LDVFchZSrRV1F8pYwW6uewR6UYA4
+ZEpX/A9AwYqBVYIk69S9kUQSeSqwxY0/6u6Q7tXvnp88OOruS5ifCL2+e3jWCygF
+9QhOEKbh8TzarHwhtzO7GH/Y3cNSF+pZR+d0tMYnDHheY7AP7ZcFV3329lZItEXn
+Hgtf6zTJl2GuCclUMSRta4tpF7+dhNDqxstfr0wkhQDfnRpeL8KvGeRenoqss00R
+cxOuNuw5nLr0sWRQ0QGPkW8wjXsV9PRqys3eDvAjSODjb8AkXhKZGOcvQs+4X0Hg
+A68iHb9Q+UUyPviyLdyrOqh1XBQT9mJQo297LjnIeexpnsICM2ggc8kM+ZAk9a/F
+zYpz+4EqrAlXRxQa8vTARnPJsk5QBlbkNuMjthKqrOL5IaaHtw0HVzV0tpP5vQK4
+BsbzJ1mWQCxfETgcl74iD2XEjYk8wDzfI//Xp6Stl2oVZBzFSiL4+RD8H4iiewn8
+nWJK5W2GMs9FnHJbfM6R8KDxHjYIE09bVfWa+l//YcdnINOwFNxRVRfw5poXAJwy
+DkXRlLM45l/4KWj6fi70
+=O3Yk
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
similarity index 90%
rename from app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
rename to app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
index 0458ef1eb1d17a0005166e15fbab1bc056663420..1a7e75a8a2b28f5f547479cd32c152fc4ca9ebba 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r2.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.21 2011/11/10 12:28:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild,v 1.1 2011/11/12 12:32:14 scarabeus Exp $
 
 EAPI=4
 
@@ -63,34 +63,17 @@ ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-
 ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRC_URI+=" ${ADDONS_SRC}"
 
-TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
-TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
-TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
-TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
-TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
-TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
-SRC_URI+=" templates? ( ${TDEPEND} )"
-
 unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
 gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
-templates test +vba webdav"
+test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-# lingua for templates
-LANGUAGES="de en_GB en_ZA es fr hu it"
-for X in ${LANGUAGES} ; do
-       IUSE+=" linguas_${X}"
-done
-unset X
-
 COMMON_DEPEND="
        app-arch/zip
        app-arch/unzip
@@ -301,24 +284,6 @@ src_unpack() {
                done
                unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
        fi
-
-       # copy extension templates; o what fun ...
-       if use templates; then
-               dest="${S}/extras/source/extensions"
-               mkdir -p "${dest}"
-
-               for template in ${TDEPEND}; do
-                       if [[ ${template} == *.oxt ]]; then
-                               tmplfile="${DISTDIR}/$(basename ${template})"
-                               tmplname="$(echo "${template}" | \
-                                       cut -f 2- -s -d - | cut -f 1 -d _)"
-                               echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
-                               if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
-                                       cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
-                               fi
-                       fi
-               done
-       fi
 }
 
 src_prepare() {
@@ -478,6 +443,7 @@ src_configure() {
                --without-ppds \
                --without-stlport \
                --without-helppack-integration \
+               --without-sun-templates \
                $(use_enable binfilter) \
                $(use_enable dbus) \
                $(use_enable debug crashdump) \

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
similarity index 88%
rename from app-office/libreoffice/libreoffice-9999-r1.ebuild
rename to app-office/libreoffice/libreoffice-9999-r2.ebuild
index 5e941cb3b4891c1a3ed58b92f47e8d376deb691a..730718d00a1a84d4db32991af5c8618dbe5211c5 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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.58 2011/11/11 14:54:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.1 2011/11/12 12:32:14 scarabeus Exp $
 
 EAPI=4
 
@@ -64,34 +64,17 @@ ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.
 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
 SRC_URI+=" ${ADDONS_SRC}"
 
-TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
-TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
-TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
-TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
-TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
-TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
-SRC_URI+=" templates? ( ${TDEPEND} )"
-
 unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
-+jemalloc kde mysql nsplugin odk opengl pdfimport svg templates test +vba
-+webdav +xmlsec"
++jemalloc kde mysql nsplugin odk opengl pdfimport svg test +vba +webdav
++xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-# lingua for templates
-LANGUAGES="de en_GB en_ZA es fr hu it"
-for X in ${LANGUAGES} ; do
-       IUSE+=" linguas_${X}"
-done
-unset X
-
 NSS_DEPEND="
        >=dev-libs/nspr-4.8.8
        >=dev-libs/nss-3.12.9
@@ -278,24 +261,6 @@ src_unpack() {
                done
                unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
        fi
-
-       # copy extension templates; o what fun ...
-       if use templates; then
-               dest="${S}/extras/source/extensions"
-               mkdir -p "${dest}"
-
-               for template in ${TDEPEND}; do
-                       if [[ ${template} == *.oxt ]]; then
-                               tmplfile="${DISTDIR}/$(basename ${template})"
-                               tmplname="$(echo "${template}" | \
-                                       cut -f 2- -s -d - | cut -f 1 -d _)"
-                               echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
-                               if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
-                                       cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
-                               fi
-                       fi
-               done
-       fi
 }
 
 src_prepare() {
@@ -439,6 +404,7 @@ src_configure() {
                --without-system-mozilla \
                --without-help \
                --without-helppack-integration \
+               --without-sun-templates \
                $(use_enable binfilter) \
                $(use_enable dbus) \
                $(use_enable debug crashdump) \
@@ -466,7 +432,6 @@ src_configure() {
                $(use_enable xmlsec) \
                $(use_with java) \
                $(use_with mysql system-mysql-cppconn) \
-               $(use_with templates sun-templates) \
                ${internal_libs} \
                ${java_opts}
 }