projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3f6b82)
Revision bump and add patchset, remove older. This one is unmasked so enjoy your...
authorTomas Chvatal <scarabeus@gentoo.org>
Wed, 9 Nov 2011 19:08:40 +0000 (19:08 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Wed, 9 Nov 2011 19:08:40 +0000 (19:08 +0000)
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
RepoMan-Options: --force

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild [moved from app-office/libreoffice/libreoffice-3.4.4.2.ebuild with 96% similarity] 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 dc97067a5cb3f4f7d90f51b2f6c067a7d86bb711..5380bdc6f0d55c0411028147f28dd6d008002fde 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,20 @@
 # 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.193 2011/11/09 10:12:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.194 2011/11/09 19:08:40 scarabeus Exp $
+
+  09 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-3.4.4.2.ebuild, +libreoffice-3.4.4.2-r1.ebuild,
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+  Revision bump and add patchset, remove older. This one is unmasked so enjoy
+  your compilations.
+
+*libreoffice-3.4.4.2-r1 (09 Nov 2011)
+
+  09 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-3.4.4.2.ebuild, +libreoffice-3.4.4.2-r1.ebuild,
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+  Revision bump and add patchset, remove older. This one is unmasked so enjoy
+  your compilations.
 
   09 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 5994927a2d4960a9e1f138a888c1dd08b8dee49f..186deaed3e12b99f665c2703ae7f6c534905a2c2 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -109,6 +109,7 @@ DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a0
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
 DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
 DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
+DIST libreoffice-3.4.4.2-patchset-01.tar.xz 3576 RMD160 6a2bea02a549661d03d68febe650e929a273ceb9 SHA1 85bfeefad25ffa99beb7620125b33ec91a94295a SHA256 c3bf80e40a21ff436f4b9e9f45aab8e4ea1e0ddf2dd99202d513e2db1a7e5853
 DIST libreoffice-artwork-3.3.4.1.tar.bz2 21989297 RMD160 7700b89bebbf299697fb4420ec3091f107fcca25 SHA1 9dd17d8934c1efa8f14727b8513b51b25f82aebc SHA256 d20f6da3a4c5d81816c401ca673eb151069f38277a9805dd6a36a9074d7f1fda
 DIST libreoffice-artwork-3.4.3.2.tar.bz2 13537796 RMD160 26c74962452a3be0258f9417bea66c50b9e9fc80 SHA1 a42d6a44c3b3605cea49c66162507adec5c1f246 SHA256 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743
 DIST libreoffice-artwork-3.4.4.2.tar.bz2 13539032 RMD160 e16be6bca3824198cbc66366aafa28878a7bc490 SHA1 ceb591a97a5132cf50756dffac974c76d9f535bd SHA256 b30265ed7b30fa87eee4677521b414984d41c2a9766364a624c623fffba4aae9
@@ -172,25 +173,25 @@ DIST libreoffice-writer-3.4.4.2.tar.bz2 7296517 RMD160 0ea8e99afe53c3ad81148562f
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2e98f9 SHA1 76ee2d703a045fe306a119f7c750d5f1633a240e SHA256 4d723c31545c807a77b3b24199b566bcec50f4784a5a767ef021a13f5843d1f1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
-EBUILD libreoffice-3.4.4.2.ebuild 16230 RMD160 e9dee95e4c013d38e0ed97e94837679402918494 SHA1 235a45abfcd1dca5ffc3dea94366bcfa7294858e SHA256 0af9ab7b728b6f781648c0174fdf8e3f7512db853e114d628ba4f6e4576b40f9
-EBUILD libreoffice-3.4.9999-r1.ebuild 16235 RMD160 760cac63fb0d1689889becfbd2a205459f435ed3 SHA1 2557f8a9cfb15042c79c915c08b33e8fced3de08 SHA256 10dc12813968fd9fd8b0ffaadc46b8ef1012c3c4eaa55d09fdc05727c2a390eb
-EBUILD libreoffice-9999-r1.ebuild 14578 RMD160 e706a18c7f09f4075ce5e6974020693b3b70d031 SHA1 cb4ede748ffcb141a0d79ab4c4a94cc7b1053ba0 SHA256 6f5c7922ab4a5c562a1665d8b73c390ef3bfeaaac42687ed1183ffd5e4f66f23
-MISC ChangeLog 35169 RMD160 a708f6ad3651c24d4e47ab3956f3b618d59459da SHA1 c805682956f553eb20ad4b0fadf0567b6a1b8e83 SHA256 c048434aa1a8d7811cfdc08888bb7c23b0d1803698d9e5fab2132370c8c61b71
+EBUILD libreoffice-3.4.4.2-r1.ebuild 16543 RMD160 bb0ae45b2ae5b5842ff6c0448422a6775a126966 SHA1 f8f9a04d14a79da20160cf7d42c9f8d2b460208f SHA256 221aa5fa172801161fb79afe45bdaa9e1738f9c71e21f79c660129f96b8559ea
+EBUILD libreoffice-3.4.9999-r1.ebuild 16567 RMD160 979ce45e6e9eef74fa9e109ae2724dd34d923340 SHA1 8f9353ef98f51a3b92ab21d491762f2a01878639 SHA256 4bd3948d60626dc6c12c79165510a5f7ff4b077ca20bfac336f8d09ee3fb54d2
+EBUILD libreoffice-9999-r1.ebuild 14910 RMD160 12289d54503e99c4e7fa48ef480be8bc15c78737 SHA1 fced198e91e245a5e5c7395d34a87e32d29132c0 SHA256 87cc4085bd525047a0e98f43a3398118cf454856dfae320e34302a97ea98f32d
+MISC ChangeLog 35768 RMD160 3ac74856dd5b8dc940a63e2366c2657fbdb428a3 SHA1 dab875d6ea084bc10a041a851128e8646e8aee5d SHA256 b6d66044822f961f2641d7922ef187be8bb6e2da15df3084c2bec160451dc7be
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOulIcAAoJEOSiRoyO7jvoJOoQAIWSUch1It4pgVta4GgaThd7
-uFTguhQ50G2ID7zyOmhebETXi/TRHoIUxBWizqoIQQG6ecBw9G7WZhr5NcGGSpQG
-HYMgslS3ljBwYAFwiudgnFsTT+6qSHsguO8Dfcl24ImUusro+XgDsaS1M6v6p3GA
-ulZ0pSpiM93/rHajp2S98+roNJ9zwxtsCBbgiSc/V2YUhjU+cx17Ad+Ji3a7TFk6
-l8k7BpBUWOLd9fyewM8FKL9IqVUxXOKWjczH4NhsoC7hCa93TAehD6tfIjKOmJ4a
-/J+DbQahmMxst8hf4WFX4jxhvFY69Xa1xnvLLitHHripfsYYwqvEHSZh66aTImiR
-vXzoZL+wQmVEtdZn8aJlCyrNbKi1f61D7+on/TkkmQEkaWZD/8C3VTaSXdMMKpep
-5wGougIADkxBNk+mIbnvnHZpF5xXgGKIpW25ZRFI5amDYLL+F/dMOiT8YwzILZbJ
-+srqZQrr03hluuTE+2w+4CP95HXdyMTD3G+5Wwa75yem/IKGBaiXclEn/JYMV7UR
-1XnhrNHfcaN0QxOtxv5WuT0iwVX28gWSltdMyRk2WwakjBDhnOmhUZKBeQAciDDj
-yIiX3WxSAcri37BrWgYNeQ7pKGgRJ+fIpfx3ATHUi2dR8b9l7yC701xMJcLVyIER
-bZBnFRWqc70o1YWeDu5V
-=49yS
+iQIcBAEBAgAGBQJOus+vAAoJEOSiRoyO7jvoK2sP/jNsZjodq5Tb4drQkRDVcLsL
+dX/2L2Sw5Tn3TFVP/fcvJhX319csK/U0pGPntivT+Icge0t4Ts80sCIaoLhN3ao+
+cESUbArwZgPV0ew8nQ/x+CpAe6T7CcYUrqqJprDrPEnBzWH410djwzGnLcvwN7hg
+Qr7tav43dXEcV3eqLlC3eKAFa2vWsT4J/M78wiVLjlWSPyafXPD0IDo0StVRt/T3
+XiuHMJyQWGWONb1ARvcvHXQos2+S3TB/ReIizOghN3ZMW2nWvnCyYcGnig7Y+VKd
+UhXJ8T9+7xNyXZemArSFsTG0KUB3+j9GtDxeo/ac29xzEJotsYb+yqsAL0Lc4wM8
+X3Aapvg0XFBEz55tEsHwpWKkE6PFIlHvBLh/Uo7czWnZ2I38sA2iItYRZBVhBhyJ
+x9LbRHy0OMEH6aGnRdi6vzA9sseQ+Lkouvgv/xVahmz+382i4+K8yEfS4476IJaI
+CGEhH3erWvJrrqmvEBqQ1JChXte8takOseXEDKk4VDbKDuOmTa8Pe4k+acfTmuP+
+T1S0SMId7Os0U+caxagi2Ru6R4G3sN5b1ukhamNInjwlhCRUxDB8Xi269zh1B0/t
+XCQfxIYoNgZEpA/BxiGDIcRM3irsa7L/VGVsnXOb2fjxHpbrrF9fkT0lrtF4rC9b
+POZezJRUamXSfLxSlfMT
+=piR1
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
similarity index 96%
rename from app-office/libreoffice/libreoffice-3.4.4.2.ebuild
rename to app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
index 58b5f92b01d57de7f7efeac583c5b8c7e5ca2f4b..7350a008c7fd1c8d9c03a27045897a00cf914126 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.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.4.2.ebuild,v 1.2 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.1 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
@@ -31,6 +32,7 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Bootstrap MUST be first!
 MODULES="bootstrap artwork base calc components extensions extras filters help
@@ -299,6 +301,8 @@ src_unpack() {
                unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
        fi
 
+       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+
        # copy extension templates; o what fun ...
        if use templates; then
                dest="${S}/extras/source/extensions"
@@ -329,6 +333,13 @@ src_prepare() {
        # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
        filter-flags "-O*"
 
+       if [[ -n ${PATCHSET} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+
        base_src_prepare
        eautoreconf
 }
@@ -357,9 +368,9 @@ src_configure() {
        # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
        # dmake: not worth of splitting out
        # cppunit: patched not to run anything, just main() { return 0; }
-       #          workaround to upstream running the tests during build
+       #                 workaround to upstream running the tests during build
        # sane: just sane.h header that is used for scan in writer, not
-       #       linked or anything else, worthless to depend on
+       #          linked or anything else, worthless to depend on
        internal_libs+="
                --without-system-hsqldb
                --without-system-cppunit
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 4960ef15a79112497947befd26ddb1fcad3c793f..2f51007358305e538ccde439f40bca962e185cab 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.19 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.20 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
@@ -31,6 +32,7 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Bootstrap MUST be first!
 MODULES="bootstrap artwork base calc components extensions extras filters help
@@ -270,6 +272,7 @@ pkg_setup() {
 src_unpack() {
        local mod dest tmplfile tmplname mypv
 
+       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
        if use branding; then
                unpack "${BRANDING}"
        fi
@@ -329,6 +332,14 @@ src_prepare() {
        # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
        filter-flags "-O*"
 
+       # patchset
+       if [[ -n ${PATCHSET} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+
        base_src_prepare
        eautoreconf
 }
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index b5c1a9dbc4cf243b9f471043d6a5eb765625ef16..9a3d6b88291dd7a8b955f70145814be41bf6697d 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.55 2011/11/09 10:12:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.56 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
@@ -31,6 +32,7 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs
 # Core MUST be first!
@@ -243,6 +245,7 @@ pkg_setup() {
 src_unpack() {
        local mod dest tmplfile tmplname mypv
 
+       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
        if use branding; then
                unpack "${BRANDING}"
        fi
@@ -299,6 +302,14 @@ src_prepare() {
        export ARCH_FLAGS="${CXXFLAGS}"
        export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 
+       # patchset
+       if [[ -n ${PATCHSET} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+
        base_src_prepare
        eautoreconf
        # hack in the autogen.sh
Unnamed repository; edit this file 'description' to name the repository.