* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-22 22:06 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-22 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 00a5edf0f4f2a13c2abacdfc58f45c28aa91a602
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 22:05:30 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 22:05:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=00a5edf0
[app-office/libreoffice] mdds is just build-dep
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d8d3576..fa65c2c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3
DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 19198 RMD160 f309d197b52467300be0546843d342fa41a3e185 SHA1 c829a06be777f8d8037fc71112cf57be4bc36c18 SHA256 53b8271347cc9ac0d56dcce7b4ecdf9851a52fca9538cb83000dde4873a63dc7
+EBUILD libreoffice-3.4.2.2.ebuild 19198 RMD160 ab7c4ba6d15bfe05a3ddad2658fcde8ea56f578b SHA1 d89cdbdda78fc698b7f5004ebe5aa5f953ff7ece SHA256 2b054d74456da4198eca008ac8c393e1e1edbef598009ffc91103f06a17b1c55
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 1b05d94..6fd43e2 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -136,7 +136,6 @@ COMMON_DEPEND="
>=dev-lang/perl-5.0
>=dev-libs/openssl-0.9.8g
dev-libs/redland[ssl]
- dev-util/mdds
media-libs/freetype:2
>=media-libs/fontconfig-2.3.0
>=media-libs/vigra-1.4
@@ -194,6 +193,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
+ dev-util/mdds
dev-util/pkgconfig
media-gfx/sane-backends
>=net-misc/curl-7.12
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-23 9:55 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-23 9:55 UTC (permalink / raw
To: gentoo-commits
commit: c27ffc1bfd3144fa339ad97f7c52865e1088300b
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 09:54:55 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 09:54:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=c27ffc1b
[app-office/libreoffice] depend on lpsolve
---
app-office/libreoffice/Manifest | 3 +--
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5b51af5..176d5d6 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,7 +27,6 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad43e92335
DIST 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 728789 RMD160 c5590829fedb1934a4854fb5d9a85d443cd0f406 SHA1 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 SHA256 5ff7825fd09d0774b4f863ac77ed0d0349e4910de6c596e92c0af2ed9ecc0306
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD160 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd063f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 20335 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149bf04d1289c83cb222a2708
-DIST 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
DIST 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz 1657246 RMD160 00d43701b92a6b7befacf082bbf01a4ecfe71275 SHA1 d55390a4242ad61f034291f1c854ab037e508272 SHA256 edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 RMD160 cf09fd0e4911275fddac1779cdbcfc6a7769eb5c SHA1 3232dd31859be4f7eb443c33e8e3287f394789a0 SHA256 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
@@ -90,4 +89,4 @@ DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3
DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 18955 RMD160 77bc695fbe2477a0c5097b3dbb2bb5366fa53ccd SHA1 d4a513bb81040e0084d3f527ae796f6c85c088ce SHA256 0f372784cbbf8265fb330a0ac465375a2ea3e93348be48227835f0ba74022b11
+EBUILD libreoffice-3.4.2.2.ebuild 18871 RMD160 60eb69d88819fcc2bec13f9f5f4916ef4509fea4 SHA1 6dbe746adb37c092c02e26b7f1f7730ffb0fc1e6 SHA256 3c340564ff12109a092bc906843ef107a0a5e74ba37e727f52f1e12466cc20f6
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index a26fc83..e785c33 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -38,7 +38,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-3
ADDONS_SRC+=" ${ADDONS_URI}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
-ADDONS_SRC+=" ${ADDONS_URI}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
@@ -141,6 +140,7 @@ COMMON_DEPEND="
>=media-libs/vigra-1.4
media-libs/libpng
media-libs/libwpg:0.2
+ sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
>=x11-libs/cairo-1.0.2
@@ -355,7 +355,6 @@ src_configure() {
# we should use in-system dmake: so far fails
internal_libs+="
--without-system-hsqldb
- --without-system-lpsolve
"
# When building without java some things needs to be done
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-22 22:55 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-22 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 2aaab15c7425a816ac5f193ef4d9fe383b55adcb
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 22:54:58 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 22:54:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=2aaab15c
[app-office/libreoffice] drop unused code.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index aff26bb..5b51af5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -90,4 +90,4 @@ DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3
DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 19141 RMD160 c921f20cc2bdcf93e594daf3949836bd00129a8d SHA1 d73067229f5f7c8d09eea02147983077a039cd4d SHA256 45ce788b4ae49ab512d551e7e5f22340c7a6d34b6e338b61c93ac1ae79c1a945
+EBUILD libreoffice-3.4.2.2.ebuild 18955 RMD160 77bc695fbe2477a0c5097b3dbb2bb5366fa53ccd SHA1 d4a513bb81040e0084d3f527ae796f6c85c088ce SHA256 0f372784cbbf8265fb330a0ac465375a2ea3e93348be48227835f0ba74022b11
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 013f5b2..a26fc83 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -339,12 +339,6 @@ src_configure() {
local themes="default"
local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
- # ensure that qt4 and kdedir are properly located
- if use kde; then
- export KDE4DIR="${KDEDIR}"
- export QT4LIB="${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
# expand themes we are going to build based on DE useflags
use gnome && themes+=" tango"
use kde && themes+=" oxygen"
@@ -360,7 +354,6 @@ src_configure() {
# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
# we should use in-system dmake: so far fails
internal_libs+="
- --without-system-altlinuxhyph
--without-system-hsqldb
--without-system-lpsolve
"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-22 22:48 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-22 22:48 UTC (permalink / raw
To: gentoo-commits
commit: ae374d83f1979eba9762b49b55ce877e8267002c
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 22:47:03 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 22:47:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=ae374d83
[app-office/libreoffice] use system hyphen
---
app-office/libreoffice/Manifest | 3 +--
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fa65c2c..aff26bb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -41,7 +41,6 @@ DIST 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt 42487 RMD160
DIST 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt 4998642 RMD160 61bbecc48c94393b9c04fa9c11282dd55d42a871 SHA1 d2b6a076b40d8d517075e52220ddd8f89f655c8f SHA256 f15b13b947d8690bf05c4dc4cb04ab89297565ccddf02cce37b831376151ba29
DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 14952999 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33f343d2293a56a58bf1ef1b
DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f2c2b204b5997604484
-DIST 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz 612842 RMD160 a0cfdade91eba06441faea5292c4653b128e4a67 SHA1 5149507aee5807c04c34a82b18bcd54a8cb61213 SHA256 d5547b963a890cbc0edd0e9286e3ccbf10a4cff3067891c8ce808d30402d58b8
DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419 RMD160 1f01d5f4d8be121bc3aaa5c5d69c9bbb50cfd912 SHA1 bf25bef71f72a4622089c85958bfd6c58d8516a6 SHA256 4eb76551b548c0e7fdc5048be8462ddb61dfb7bba4bbc23b46189356b4b0976c
DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 RMD160 cf457953fd947bf7f60274377ef88124bb788108 SHA1 4fea33622d89c7ac62053e5ee3616cfe504e0f14 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc
@@ -91,4 +90,4 @@ DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3
DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 19198 RMD160 ab7c4ba6d15bfe05a3ddad2658fcde8ea56f578b SHA1 d89cdbdda78fc698b7f5004ebe5aa5f953ff7ece SHA256 2b054d74456da4198eca008ac8c393e1e1edbef598009ffc91103f06a17b1c55
+EBUILD libreoffice-3.4.2.2.ebuild 19141 RMD160 c921f20cc2bdcf93e594daf3949836bd00129a8d SHA1 d73067229f5f7c8d09eea02147983077a039cd4d SHA256 45ce788b4ae49ab512d551e7e5f22340c7a6d34b6e338b61c93ac1ae79c1a945
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 6fd43e2..013f5b2 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -31,7 +31,6 @@ done
unset mod
# addons
-ADDONS_SRC+=" ${ADDONS_URI}/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
@@ -132,6 +131,7 @@ COMMON_DEPEND="
dev-db/unixODBC
dev-libs/expat
>=dev-libs/glib-2.18
+ >=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.0
>=dev-lang/perl-5.0
>=dev-libs/openssl-0.9.8g
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-22 21:43 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-22 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 53a22c583c865c6d55f2769b4938d7a038dbb367
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 21:42:39 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 21:42:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=53a22c58
[app-office/libreoffice] use system mdds
---
app-office/libreoffice/Manifest | 3 +--
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f8b8515..d8d3576 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -49,7 +49,6 @@ DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e900cb8670b
DIST 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 7194574 RMD160 90c028196852e7e6a1b2dcf8647b88eeb232f0b9 SHA1 b97bfb0e3e32f4e4857847d5fb5658202b730e62 SHA256 0647e762eb3c31f871c3d056fb7c907b2917a5b183580d434f15b2d9e0047791
DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413c06b3ed3cae34a5f5
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
-DIST 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 89218 RMD160 45084e33b514ad9fe4b6e6b4693891a19666764f SHA1 bddc19fc2f1879f0fbde66a13b58ae1370e4dc25 SHA256 abeaed31fe3cf0ddab892492e3cc4179181ffb50d9c18d5f16bd574a13f42c3d
DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 RMD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d9439e0896ca8ee1a8563
DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 RMD160 3235b45b4065750b0b2df4735a57ca1f815dfc69 SHA1 a637c0c3ad3be32d6814972e1c45e547c5f6359d SHA256 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
@@ -92,4 +91,4 @@ DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3
DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 19288 RMD160 3e464a49cc67de5cedbe31a0b5d82abf845758b1 SHA1 3ba3576ea872e8973fd226106dab7eb9f025eab5 SHA256 0a529174b48577830e112f46b08a2a4f1578b873f1a603b5259ca276b4d6ce57
+EBUILD libreoffice-3.4.2.2.ebuild 19198 RMD160 f309d197b52467300be0546843d342fa41a3e185 SHA1 c829a06be777f8d8037fc71112cf57be4bc36c18 SHA256 53b8271347cc9ac0d56dcce7b4ecdf9851a52fca9538cb83000dde4873a63dc7
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index d78f68a..1b05d94 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -76,7 +76,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0
ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2"
ADDONS_SRC+=" ${ADDONS_URI}/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz"
ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
@@ -137,6 +136,7 @@ COMMON_DEPEND="
>=dev-lang/perl-5.0
>=dev-libs/openssl-0.9.8g
dev-libs/redland[ssl]
+ dev-util/mdds
media-libs/freetype:2
>=media-libs/fontconfig-2.3.0
>=media-libs/vigra-1.4
@@ -363,7 +363,6 @@ src_configure() {
--without-system-altlinuxhyph
--without-system-hsqldb
--without-system-lpsolve
- --without-system-mdds
"
# When building without java some things needs to be done
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-22 15:39 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-22 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 6ee6326c0708d2ee3c69b6cef1eeba4236bc82e4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 15:38:23 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 15:38:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=6ee6326c
[app-office/libreoffice-3.4.2.2] bump
---
app-office/libreoffice/Manifest | 42 ++++++++++----------
...e-3.4.2.1.ebuild => libreoffice-3.4.2.2.ebuild} | 0
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 23408c6..f8b8515 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -71,25 +71,25 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ff
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
DIST fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz 1117561 RMD160 6810d86d974524e6627076e6530a703d62039160 SHA1 55e08ee78c15de417cbfccb9e748747095994886 SHA256 066b786ac12f75940a5b8ead444c824460f53feb6f6161a110dcf16efd5c7de3
DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
-DIST libreoffice-artwork-3.4.2.1.tar.bz2 13540850 RMD160 96d9d3c1ac5b4912b4f73e4d5286d2ea1ac26fef SHA1 002348dd49d7d653aac40a61981139a8f6adbbf8 SHA256 a2a8c608d44a42610541f3a73bd41e6bdf5048daa50a175dc20690e3b7bd68d5
-DIST libreoffice-base-3.4.2.1.tar.bz2 2070040 RMD160 bf7e5ed470d115092e07e1fac5722d74ff66b00e SHA1 7c5f989ae6ed2ca1d7eaebbab51ec73422ddf102 SHA256 146e3716f82f639589e3e556af7bb299a7e3114c19539b06357b2be2542e54c3
-DIST libreoffice-bootstrap-3.4.2.1.tar.bz2 2712277 RMD160 6673b15ba6383799575bed954177edfae736a6ee SHA1 086f0dd03734f3b16e9e00c73e6123ac83f814a1 SHA256 e90a8b41fa3669d25140846fa7168ea8e951fbde1dde15d32911915bc117422d
-DIST libreoffice-calc-3.4.2.1.tar.bz2 9516379 RMD160 86f70c81ca6d6e8237bf73f272d4c3ab5228c3a4 SHA1 869d5ffb27a9216af8afc965923f1a037966756b SHA256 7f7ed160fe16af7ba79714d677a2f40a4a753a2f3876858ed432e25ce774e7bf
-DIST libreoffice-components-3.4.2.1.tar.bz2 5094962 RMD160 12db542294ed890d365fb283016f956ff24e86f7 SHA1 6e70ecd09306271a29efe365ed5ce7c62dbd3450 SHA256 da0646303e41159b65d7b1ae8adbd8f55b49eb3b7607b022b74a09a0883421a0
-DIST libreoffice-extensions-3.4.2.1.tar.bz2 4216447 RMD160 ff7694010ab8cfbdf01d8a3767dbfd4e5e9d7860 SHA1 d9aa620fdec624e2cbc9d24e1b4f10e91dadda5a SHA256 74dbcc4ad7901746497ee7dbc3c5ff05e6b927ab934390ee416fb50f01b39291
-DIST libreoffice-extras-3.4.2.1.tar.bz2 38641799 RMD160 e8f0a7775fda7694101f8f230b87dc8773b45c79 SHA1 6dd2f2290161c5f959b08bf8a4e07bf0f243067d SHA256 09cee50cc9092bfc8dad6a422d110c74bdfe506b22b221e78224bcdaff40438b
-DIST libreoffice-filters-3.4.2.1.tar.bz2 11776964 RMD160 983821c3b534bbb4924680b0890c63227ac35425 SHA1 4b7b2f0907c276c0c51bbbe9e2ffaeb515c56518 SHA256 58243eae9e172f3a72b002c91c9065bf76121ee05f974d6c3cdec01452932e4f
-DIST libreoffice-help-3.4.2.1.tar.bz2 1845924 RMD160 85c12f0a7e2fe7f4412ae0c2b510a0f1c49b2ab1 SHA1 2cde0d347e2c4b45a96c963a8d8cba80b16dbcc7 SHA256 52c6bee93679ecae72a71514cf60b41f912b7c2346816c009cca818c1b68bfdc
-DIST libreoffice-impress-3.4.2.1.tar.bz2 2651094 RMD160 b7e42578528941d8e31b9bee86a4331c68d5a797 SHA1 1de86ff58fe7f2d7132333808838c092fa7c57a5 SHA256 f7d40c1d8ffa6c5eac691ac9a660f64c6baa6497d442a1a9146b9ca5a6d0aa90
-DIST libreoffice-libs-core-3.4.2.1.tar.bz2 15591092 RMD160 cbf78085ae87286a3a2603a1e5de63900755e6f4 SHA1 6066df73d40153b5edd273415f258a96d2ece3cc SHA256 36d71820ff0708fddfa522c5531bee598e7b8b8a995e1e689939b3300ca787f7
-DIST libreoffice-libs-extern-3.4.2.1.tar.bz2 637395 RMD160 7599ed65bf089bb0d5aeae2d318d8443f4690679 SHA1 b5c317e39798c29a78532e6b0a9d77c874a98f0b SHA256 772b734b12adf3b249e97304d638a5ccc8ff13e82e0f9787c94ca8b45c7115c6
-DIST libreoffice-libs-extern-sys-3.4.2.1.tar.bz2 40014925 RMD160 56f959cd387dc345df84033fc88d5b0f8c2e5714 SHA1 eb483c6e5387dfb2eacd90bef53b13cd928f5abe SHA256 27c7677c841f05f1a6aa94ad3752961f6790d584e0960445a3deb2f179345b2f
-DIST libreoffice-libs-gui-3.4.2.1.tar.bz2 10855476 RMD160 324094f32e2f8434877238a3d25232828df2b3c6 SHA1 e34fce477c229483b864617dcc5a1ca13917d546 SHA256 5c02302dfe45f0ef0292e2e93783c6f976f297260d3381b2d01e90dc61ea50b3
-DIST libreoffice-postprocess-3.4.2.1.tar.bz2 50763 RMD160 25057eeef614cf0f0182b93cb0ca79c76dc41f9e SHA1 5c2b9d9251e607ff28141bced3c77afae8a6a22f SHA256 087a974f71260b98b77482fdaa3c33085fed8f11892cf447b54335a32d53ab82
-DIST libreoffice-sdk-3.4.2.1.tar.bz2 1721580 RMD160 68960a750216d97725fc54fa7200890cc2c8be65 SHA1 e001dac22a608d7ce3233e975faecacd977fb158 SHA256 f23fc59c4aaf85bdd2a5b74fbcb407a9d401d3546b1e946d6417198a1895564f
-DIST libreoffice-testing-3.4.2.1.tar.bz2 50845925 RMD160 c4fff88faff26b3c68d193db484ba605abb56008 SHA1 1989b7dca5d85e0374b133fdac7d1100a08374d0 SHA256 e54f175be44afa47a3aa9225de36c6665869b64c668ac4ee80acfbc5354eabd5
-DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013eaec0e3de7f876f1d052d712 SHA1 213f44367b99aa548fa6f36a8ff134dbd9d593c5 SHA256 7efe8a080ac46907331ffcbbdbf345c12331d129cc727a23ebd516d1f8efd693
-DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
-DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
+DIST libreoffice-artwork-3.4.2.2.tar.bz2 13540475 RMD160 8844467ad68632f7b31a6e757003c6296afedd81 SHA1 3608393750e0ffd19c157cdfc440f9f4b92e28cb SHA256 a79cbc74cd8c2cf70bfd45c6db0a7560bf2de02d6604c787cdd09d4e078abbf5
+DIST libreoffice-base-3.4.2.2.tar.bz2 2068542 RMD160 337fe71100b954a09fb583c9a6792e90a8a1faa6 SHA1 735446bbd9ad378e4640f4e0c96964d0fd4d4065 SHA256 3a1fbd48e33ad7f0850e7339ef1f81c37f184e59eb49af996a78d4396af06367
+DIST libreoffice-bootstrap-3.4.2.2.tar.bz2 2712979 RMD160 4012b440095321bb6fe12addb4b624bb9226ca26 SHA1 543f1ec7cbf49cbfa4df46cf2fe62e6e626117d4 SHA256 1cab94a57f3688e778323a536f446ab31d33e7fa411bc7106bc067f8a853b612
+DIST libreoffice-calc-3.4.2.2.tar.bz2 9514579 RMD160 2b1bfa1d33a663ebbaa48f0748ecb9c1f7828f9e SHA1 4bb6a717726771785d28e044b540f001efc32503 SHA256 2273b6655199a6514084754a5c5b2f6c08d2b730ec919b17bed8421b613a7ad6
+DIST libreoffice-components-3.4.2.2.tar.bz2 5095907 RMD160 b5ba4debc7592988bd0d03ac79379e2d0bcdb208 SHA1 419353008725b5d4305cd8967bfc527236c967f2 SHA256 dcb721151db426cb22ae7d3b3a81e5539c509755f774f946a9980c6a44b9ee95
+DIST libreoffice-extensions-3.4.2.2.tar.bz2 4216511 RMD160 e80cd939c2644894ed15fb91a0954060b2dd75d5 SHA1 50a8a70d442c8ec8ca10eafca14a69a58889a26b SHA256 58579f8f0dc47b4401441940c82f484edf6ebbd3268a9f763dabc26c54d12dc8
+DIST libreoffice-extras-3.4.2.2.tar.bz2 38643479 RMD160 7436b38d049e4fba21bbffb840dc6c91dc6d95e8 SHA1 00b2bc8b3b6766339d83d63664abae1a6e97f06e SHA256 7196f75c8f2c61c6f7fd26ec947b323c0f7dad9310b87bc565d91ecf55d85cd1
+DIST libreoffice-filters-3.4.2.2.tar.bz2 11776660 RMD160 eb90b2922ca47bd567eb4e8bf9a2e3d24f132c08 SHA1 94456f839d25defdab2fb69b05c054f3cdaf66ed SHA256 722cf4dbe944a32d1c243d065992e46230d8ce1c35c5cb3a9f5e19d29fde6faf
+DIST libreoffice-help-3.4.2.2.tar.bz2 1846264 RMD160 8702930cda18488343688cf96858155e3465f33d SHA1 51c7da939bdda3381a48cd37195dab23b1175ff6 SHA256 10cae992204dca2065dd941c0a378b90642f8fe7584dcd918a7cd2c4a530127f
+DIST libreoffice-impress-3.4.2.2.tar.bz2 2651675 RMD160 10916782b5befb80e2dafcba0103d724f3ecb4f6 SHA1 1089fa229eacbd18aa7e8d298aa76e6c94b6681d SHA256 609fee64e79dffbd8d6f32e03d2f4d529006d656ba131e9fef8d7599bc92bc6f
+DIST libreoffice-libs-core-3.4.2.2.tar.bz2 15590627 RMD160 c1c56eb03756cb7f502490d2f712cf6b5776a612 SHA1 1ca7cbe9fbd487a917249a3f9ce73088a86ab256 SHA256 db68b04ebae59438db3e1526d943b9bc5fd94699492e394716289bc63096347a
+DIST libreoffice-libs-extern-3.4.2.2.tar.bz2 637668 RMD160 4a62ad88beb4a8b608d0ccb27b5d711aac55df46 SHA1 e8a09caeed653ae88ae11a414450bcedb404f0ba SHA256 410b17518da537b517004b83017cade0e8bfcc926332228809eee483b2cdf589
+DIST libreoffice-libs-extern-sys-3.4.2.2.tar.bz2 40011708 RMD160 7f953de119948e2eb801f14468d1f6e1c2628faf SHA1 665de8628a0bb52cdac43be9c652aec5491ca221 SHA256 2b0504d737ce7ed7f447a8a1e9a9bc47d7711215c5ef7acaf3c96ff979296de9
+DIST libreoffice-libs-gui-3.4.2.2.tar.bz2 10858440 RMD160 c78af2be2d5ad580f100903206599826fb4331c4 SHA1 a986ce290c0ea082a002a684007883d60a6812b8 SHA256 0cbfbcfa6506924b66107f6b8a4dd06180ed2a75a05bb87f00e513ce3a9eebd5
+DIST libreoffice-postprocess-3.4.2.2.tar.bz2 50856 RMD160 7b3dd61798e09462cebfb295bf8b278b9b45cbe1 SHA1 605c924da97398f4c3766630a09d684582cc57e0 SHA256 d48e29668e0b8efdb49120b503054805f058c4d57d6d3120c6bb8bec0d8bda5c
+DIST libreoffice-sdk-3.4.2.2.tar.bz2 1721557 RMD160 3c1065c17a23cec3414888632639480def14af89 SHA1 89c21eeea24eb61d639c920faa181ebe4f935d13 SHA256 88c14e864bd0c7c95da39e36c72d98f0d0b1159a3de6a202978b0a9f9bc54c1c
+DIST libreoffice-testing-3.4.2.2.tar.bz2 50846263 RMD160 cb785e1aec0ecfeeaebea45637b98539fb5d79ee SHA1 e5ffa90f226149b75e8e4912e9f724d0d00127f9 SHA256 e94076c063f7dd55203f25a9412485bb84577a72c96340dda40cd5aa969f5fa1
+DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3da83c997af58eb91705cb52 SHA1 b3ac0dd25fc24f46fa8dbb88abd2113a1789317d SHA256 b14755e5677df0bff096a4b6f1813026df7b8910bd7f277c9fd2df0ca4d94212
+DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
+DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19288 RMD160 3e464a49cc67de5cedbe31a0b5d82abf845758b1 SHA1 3ba3576ea872e8973fd226106dab7eb9f025eab5 SHA256 0a529174b48577830e112f46b08a2a4f1578b873f1a603b5259ca276b4d6ce57
+EBUILD libreoffice-3.4.2.2.ebuild 19288 RMD160 3e464a49cc67de5cedbe31a0b5d82abf845758b1 SHA1 3ba3576ea872e8973fd226106dab7eb9f025eab5 SHA256 0a529174b48577830e112f46b08a2a4f1578b873f1a603b5259ca276b4d6ce57
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-3.4.2.1.ebuild
rename to app-office/libreoffice/libreoffice-3.4.2.2.ebuild
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-21 20:26 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-21 20:26 UTC (permalink / raw
To: gentoo-commits
commit: d3c46ecae8eed93e3cbda1c5069a9c110b779e33
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 20:24:29 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 20:24:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=d3c46eca
[app-office/libreoffice] Drop the dmake agian.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9fafcde..23408c6 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -92,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19264 RMD160 474af866c0fffdcf0efd0261155dd42a63ff9c02 SHA1 3bd90ad13278f7e478eb97be3b50d62d3fbd3811 SHA256 d8410c1b9617871f33a89befcb8e402133affdd868c66c93b400b6160d441084
+EBUILD libreoffice-3.4.2.1.ebuild 19288 RMD160 3e464a49cc67de5cedbe31a0b5d82abf845758b1 SHA1 3ba3576ea872e8973fd226106dab7eb9f025eab5 SHA256 0a529174b48577830e112f46b08a2a4f1578b873f1a603b5259ca276b4d6ce57
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index 196aef2..d78f68a 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -192,7 +192,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
- >=dev-util/dmake-4.12
>=dev-util/gperf-3
dev-util/intltool
dev-util/pkgconfig
@@ -359,6 +358,7 @@ src_configure() {
# Things that do not have gentoo packages
# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
+ # we should use in-system dmake: so far fails
internal_libs+="
--without-system-altlinuxhyph
--without-system-hsqldb
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-21 15:22 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-21 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 344baa6f8468e440016c061add840378d4874dc2
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 15:20:54 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 15:20:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=344baa6f
[app-office/libreoffice] drop graphite flag as it aint packaged.
---
app-office/libreoffice/Manifest | 3 ++-
...e-3.4.2.2.ebuild => libreoffice-3.4.2.1.ebuild} | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7f6ad6e..9fafcde 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,6 +9,7 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce
AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
+AUX libreoffice-3.4.2-allopts.txt 40633 RMD160 24d91b414bcbb2dc92230901e452664318b2ce83 SHA1 fd914f7562c20d427a53fb7d2b95f4b0c3bc6b05 SHA256 54c7f92331ab064c713af6fb268e980dfcdf95e289efb05e63970b6a3b345a10
AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
AUX libreoffice_options.txt 6251 RMD160 570a49fd590875388ac19b6b21c4d839e4266644 SHA1 b44a85a4676c2c01dc102c8b5893e3462f10c688 SHA256 d194118debf1c098a88b3396eca12dd7ea1a2eda76b3afd63599f2bdb1c39638
AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
@@ -91,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19664 RMD160 142c7a8c11220739daa9ce2047330e12993f8380 SHA1 91a14581cb67d548a00878c1f1b8f5e400bb495a SHA256 7242a2d024fc29c9322ee51ad2c380f208ef182829579544c2b8063ada471ce6
+EBUILD libreoffice-3.4.2.1.ebuild 19264 RMD160 474af866c0fffdcf0efd0261155dd42a63ff9c02 SHA1 3bd90ad13278f7e478eb97be3b50d62d3fbd3811 SHA256 d8410c1b9617871f33a89befcb8e402133affdd868c66c93b400b6160d441084
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-3.4.2.2.ebuild
rename to app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index 0606942..196aef2 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -116,7 +116,7 @@ unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
-IUSE+=" binfilter cups custom-cflags dbus debug eds gnome graphite gstreamer
+IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer
gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates webdav"
LICENSE="LGPL-3"
SLOT="0"
@@ -398,7 +398,7 @@ src_configure() {
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --disable-broffice: do not use brazillian brand just be uniform
# --enable-cairo: ensure that cairo is always required
- # --enable-graphite: use pretty font renderer (faster and nicer)
+ # --disable-graphite: no package in gentoo
# --enable-*-link: link to the library rather than just dlopen on runtime
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-gnome-vfs: old gnome virtual fs support
@@ -431,6 +431,7 @@ src_configure() {
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
+ --disable-graphite \
--disable-kdeab \
--disable-kde \
--disable-online-update \
@@ -445,7 +446,7 @@ src_configure() {
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
- --with-max-jobs=1 \
+ --with-max-jobs=${jobs} \
--with-num-cpus=${jobs} \
--with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
@@ -463,7 +464,6 @@ src_configure() {
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
- $(use_enable graphite) \
$(use_enable gstreamer) \
$(use_enable gtk) \
$(use_enable gtk systray) \
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-21 12:34 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-21 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 07d40cf2009da4d78740f863b1ad4be097337db4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 12:33:37 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 12:33:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=07d40cf2
[app-office/libreoffice] The configure switch is enough, drop the touch.
---
app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index dac95d1..0606942 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -331,9 +331,6 @@ src_prepare() {
base_src_prepare
eautoreconf
-
- # prevent any dowloading by the buildsystem
- touch src.downloaded
}
src_configure() {
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-21 11:17 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-21 11:17 UTC (permalink / raw
To: gentoo-commits
commit: 4a11e9c68a67d5cb59cd422617ba10cfc952e5d4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 11:16:44 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 11:16:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=4a11e9c6
[app-office/libreoffice] bump to 3.4.2.2 (this WON'T work now)
---
app-office/libreoffice/Manifest | 2 +-
...e-3.4.2.1.ebuild => libreoffice-3.4.2.2.ebuild} | 39 ++++++++------------
2 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ab15402..7f6ad6e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19633 RMD160 2575d5d245b91dec4c07094df21adb1a833e64b5 SHA1 83beb341fe94801cd04bc9be737645db2293da1d SHA256 3ee5e17136365c44184a8719b1490e1cf9d27641e5eca01a6765864c81f8b475
+EBUILD libreoffice-3.4.2.1.ebuild 19664 RMD160 142c7a8c11220739daa9ce2047330e12993f8380 SHA1 91a14581cb67d548a00878c1f1b8f5e400bb495a SHA256 7242a2d024fc29c9322ee51ad2c380f208ef182829579544c2b8063ada471ce6
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
similarity index 95%
rename from app-office/libreoffice/libreoffice-3.4.2.1.ebuild
rename to app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index aae7afe..80534a7 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -114,7 +114,6 @@ SRC_URI+=" templates? ( ${TDEPEND} )"
unset ADDONS_URI
unset EXT_URI
-unset TDEPEND
unset ADDONS_SRC
IUSE+=" binfilter cups custom-cflags dbus debug eds gnome graphite gstreamer
@@ -163,11 +162,10 @@ COMMON_DEPEND="
>=media-libs/gst-plugins-base-0.10
)
java? (
- dev-db/hsqldb
>=dev-java/bsh-2.0_beta4
- dev-java/lucene:3.0
+ dev-java/lucene:2.9
dev-java/lucene-analyzers:2.3
- dev-java/saxon
+ dev-java/saxon:0
)
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c++ )
@@ -232,9 +230,6 @@ PATCHES=(
S="${WORKDIR}/${PN}-bootstrap-${PV}"
-# the libreoffice build system is not parallel safe at all :/
-MAKEOPTS+=" -j1"
-
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
@@ -291,7 +286,6 @@ src_unpack() {
# don't forget the wrapper...
cp "${FILESDIR}"/wrapper.in "${T}"
- eprefixify "${T}"/wrapper.in
# copy extension templates; o what fun ...
if use templates; then
@@ -299,10 +293,11 @@ src_unpack() {
mkdir -p "${dest}"
for template in ${TDEPEND}; do
- if [[ ${template} == *oxt ]]; then
+ 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
@@ -312,17 +307,9 @@ src_unpack() {
}
src_prepare() {
- strip-linguas ${LANGUAGES}
-
- # en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
- export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
+ eprefixify "${T}"/wrapper.in
- if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
- export LINGUAS_OOO=""
- else
- # always build en-US as a fallback (needed for broken code / translations)
- export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
- fi
+ strip-linguas ${LANGUAGES}
# Now for our optimization flags ...
export ARCH_FLAGS="${CXXFLAGS}"
@@ -373,8 +360,10 @@ src_configure() {
# Things that do not have gentoo packages
# system dmake fails to compile anything in loo
+ # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
internal_libs+="
--without-system-altlinuxhyph
+ --without-system-hsqldb
--without-system-lpsolve
--without-system-mdds
"
@@ -385,7 +374,7 @@ src_configure() {
internal_libs+="
--without-system-beanshell
--without-system-lucene
- --without-system-hsqldb
+
--without-system-saxon
"
else
@@ -395,8 +384,10 @@ src_configure() {
--with-java-target-version=$(java-pkg_get-target)
--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
- --with-lucene-core-jar=$(java-pkg_getjar lucene lucene-core.jar)
- --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers lucene-analyzers.jar)
+ --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+ --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+ --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
+ --with-junit=$(java-pkg_getjar junit-4 junit.jar)
"
fi
@@ -456,8 +447,8 @@ src_configure() {
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
- --with-lang="${LINGUAS_OOO}" \
- --with-max-jobs=${jobs} \
+ --with-lang="${LINGUAS}" \
+ --with-max-jobs=1 \
--with-num-cpus=${jobs} \
--with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-20 17:41 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-20 17:41 UTC (permalink / raw
To: gentoo-commits
commit: e8a7e099acfc949d21fec020859af60ec2f3bf3d
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 17:37:04 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 17:37:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=e8a7e099
[app-office/libreoffice] Make sure to run in single thread only.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b3d35d0..ab15402 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19553 RMD160 c7f0c54625c44f4f92637a23f10ac0f3aeb570b2 SHA1 60afd97a09ccd6665b57c2ec7cfce45e5db59b79 SHA256 3c8829e20ab19a3f502a7b62fbe6f78a5dce1fadc2f8221250ecf52127d48fb2
+EBUILD libreoffice-3.4.2.1.ebuild 19633 RMD160 2575d5d245b91dec4c07094df21adb1a833e64b5 SHA1 83beb341fe94801cd04bc9be737645db2293da1d SHA256 3ee5e17136365c44184a8719b1490e1cf9d27641e5eca01a6765864c81f8b475
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index 877a650..aae7afe 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -232,6 +232,9 @@ PATCHES=(
S="${WORKDIR}/${PN}-bootstrap-${PV}"
+# the libreoffice build system is not parallel safe at all :/
+MAKEOPTS+=" -j1"
+
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-20 12:40 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-20 12:40 UTC (permalink / raw
To: gentoo-commits
commit: f7d480b41d3acdd0b58b8b504e9e1685acde52bf
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 12:37:09 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 12:37:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=f7d480b4
[app-office/libreoffice] Make it find and copy internal libs properly.
---
app-office/libreoffice/Manifest | 7 +++----
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 11 ++++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index febed73..b3d35d0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,7 +14,9 @@ AUX libreoffice_options.txt 6251 RMD160 570a49fd590875388ac19b6b21c4d839e4266644
AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
+DIST 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 3484993 RMD160 78f48eeb84adb64e78d3fdd6724ba6095e4454d0 SHA1 820f58f1fd26b955e9853370d2d61484b24939f3 SHA256 986c8cec94f7e409497d826d0ec6809c261a3c0f3f2a891213cb9128a93ae195
DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
+DIST 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 456304 RMD160 fe72e3958fb2ed39aa5cb04ff55b643f06646300 SHA1 595487766c3814afeaaf18e1021b312dd546dfec SHA256 2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4ae034c6e983
DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD160 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
@@ -52,14 +54,12 @@ DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160
DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 RMD160 3235b45b4065750b0b2df4735a57ca1f815dfc69 SHA1 a637c0c3ad3be32d6814972e1c45e547c5f6359d SHA256 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 RMD160 61672340e92957a5b72cddddcfcbf56d9602842c SHA1 47b58e0ef2d856df26372a7061ae43fae6e08051 SHA256 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
-DIST a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html 44798 RMD160 4242fd0c126dc5d2d7edc1f66a0565bf42812a7e SHA1 e5fb08ef4f0f19018ba4b397569edb5fa1c916c7 SHA256 05e6fddefb41a3a675a719c597bf0c44d2a4116d5978d02db8a32cca5f405672
DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f05eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
DIST b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 11922684 RMD160 70435964d18c4b3c633dd50225c177ca4546269a SHA1 4ad95f5d07eae50dc4f95b04eb900c39e202fd21 SHA256 2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 RMD160 ecf14c46ddf095734752ef260134c97b1772be57 SHA1 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SHA256 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
-DIST bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 13176 RMD160 df5850e54a1049328050d6a0c46a2d109a9827d0 SHA1 cef151475872853a9f0b8e3ce6c65d829403008f SHA256 9bb0f3d57c170a6833c3aec020ec52b6c7280d26bf42c9134773c54cd238ac75
DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126bbbcf1e75da5
DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e36555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fbd9038b07b47d909f2091039338d39b0bb7d2f
DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db394 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a979
@@ -68,7 +68,6 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 RMD160 aec803
DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
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 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz 1117561 RMD160 6810d86d974524e6627076e6530a703d62039160 SHA1 55e08ee78c15de417cbfccb9e748747095994886 SHA256 066b786ac12f75940a5b8ead444c824460f53feb6f6161a110dcf16efd5c7de3
DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
DIST libreoffice-artwork-3.4.2.1.tar.bz2 13540850 RMD160 96d9d3c1ac5b4912b4f73e4d5286d2ea1ac26fef SHA1 002348dd49d7d653aac40a61981139a8f6adbbf8 SHA256 a2a8c608d44a42610541f3a73bd41e6bdf5048daa50a175dc20690e3b7bd68d5
@@ -92,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19626 RMD160 77aea6a97405b84fef4ffd80b762c2cb212d851e SHA1 9ba6edf868709f1233a289e58190866ffa444162 SHA256 aad891bfc87f181655c14bb040508f2b2d52e7759e5baa51740ce482d441305d
+EBUILD libreoffice-3.4.2.1.ebuild 19553 RMD160 c7f0c54625c44f4f92637a23f10ac0f3aeb570b2 SHA1 60afd97a09ccd6665b57c2ec7cfce45e5db59b79 SHA256 3c8829e20ab19a3f502a7b62fbe6f78a5dce1fadc2f8221250ecf52127d48fb2
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index d209332..877a650 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -32,6 +32,7 @@ unset mod
# addons
ADDONS_SRC+=" ${ADDONS_URI}/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
@@ -52,14 +53,11 @@ ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
-ADDONS_SRC+=" ${ADDONS_URI}/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
ADDONS_SRC+=" ${ADDONS_URI}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
ADDONS_SRC+=" ${ADDONS_URI}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
-ADDONS_SRC+=" ${ADDONS_URI}/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
ADDONS_SRC+=" ${ADDONS_URI}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
@@ -79,6 +77,7 @@ ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.b
ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2"
+ADDONS_SRC+=" ${ADDONS_URI}/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz"
ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
@@ -340,6 +339,9 @@ src_prepare() {
base_src_prepare
eautoreconf
+
+ # prevent any dowloading by the package
+ touch src.downloaded
}
src_configure() {
@@ -450,6 +452,7 @@ src_configure() {
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
--with-max-jobs=${jobs} \
--with-num-cpus=${jobs} \
@@ -496,8 +499,6 @@ src_configure() {
}
src_compile() {
- # Workaround for upstream download bug
- touch src.downloaded
emake || die
}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-19 13:30 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-19 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 671dd7cc4089f930940b6c9bbde8d1b5578be071
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 12:32:54 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 12:32:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=671dd7cc
[app-office/libreoffice] Fix using internal saxon.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6a26cb9..557c827 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -92,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19591 RMD160 f1f03a8dcc8a03b78ac83310a3c679a10cab1cf4 SHA1 0b9e3bfce3912d59c067091bdc656000e21dbfec SHA256 2a85ee1c0053abf57318edb5771ecc26bfa8b549996f7047fa2ddc9c907bf8e1
+EBUILD libreoffice-3.4.2.1.ebuild 19617 RMD160 252bfd1a8ac4b98dc24af7a95ab1f998583a8be1 SHA1 107dd8a225f9d86617cc68c81a415c1ef472477c SHA256 9f76ce64b15a38dfecd114184f2dbf00a8a7a7919777d32044dd530a2b92bffc
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index 5f88bdb..53328ad 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -378,9 +378,10 @@ src_configure() {
# as internal libraries.
if ! use java; then
internal_libs+="
+ --without-system-beanshell
--without-system-lucene
--without-system-hsqldb
- --without-system-beanshell
+ --without-system-saxon
"
else
java_opts="
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-19 13:30 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-19 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 3d9528e43e9f1fe04818aed30d0d8dab961724c7
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 13:29:56 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 13:29:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=3d9528e4
[app-office/libreoffice] do not use system dmake and recheck all languages.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 557c827..febed73 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -92,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19617 RMD160 252bfd1a8ac4b98dc24af7a95ab1f998583a8be1 SHA1 107dd8a225f9d86617cc68c81a415c1ef472477c SHA256 9f76ce64b15a38dfecd114184f2dbf00a8a7a7919777d32044dd530a2b92bffc
+EBUILD libreoffice-3.4.2.1.ebuild 19626 RMD160 77aea6a97405b84fef4ffd80b762c2cb212d851e SHA1 9ba6edf868709f1233a289e58190866ffa444162 SHA256 aad891bfc87f181655c14bb040508f2b2d52e7759e5baa51740ce482d441305d
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index 53328ad..d209332 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -85,11 +85,11 @@ ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-L
SRC_URI+=" ${ADDONS_SRC}"
# translations
-LANGUAGES="af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
-en en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km
-kn kok ko ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or
-pa pap pl ps pt pt_BR ro ru rw sat sd sh si sk sl sq sr ss st sv sw_TZ ta te tg
-th ti tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
+en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
+kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
+pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
+th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
for X in ${LANGUAGES} ; do
IUSE+=" linguas_${X}"
done
@@ -195,7 +195,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
- dev-util/dmake
>=dev-util/gperf-3
dev-util/intltool
dev-util/pkgconfig
@@ -368,6 +367,7 @@ src_configure() {
"
# Things that do not have gentoo packages
+ # system dmake fails to compile anything in loo
internal_libs+="
--without-system-altlinuxhyph
--without-system-lpsolve
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-19 12:23 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-19 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 70290388de5cb95aca53763f174f91b891624032
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 12:22:54 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 12:22:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=70290388
[app-office/libreoffice] typos fixing.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2d64994..6a26cb9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -92,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19585 RMD160 8c7ffc77e666bd574c424d775d15954ba76c3d6a SHA1 ecdeb6b0eda693ac6f29918b09e459c03ddd4d2c SHA256 651ff0c196cfa7f2bcc46b93726b37f5ab475c06064662020550d66bae8641a9
+EBUILD libreoffice-3.4.2.1.ebuild 19591 RMD160 f1f03a8dcc8a03b78ac83310a3c679a10cab1cf4 SHA1 0b9e3bfce3912d59c067091bdc656000e21dbfec SHA256 2a85ee1c0053abf57318edb5771ecc26bfa8b549996f7047fa2ddc9c907bf8e1
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index c4cf965..5f88bdb 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -256,9 +256,9 @@ pkg_setup() {
ewarn "If something you need does not work for you, rebuild with"
ewarn "java in your USE-flags."
ewarn
- ewarn "Some system java libraries will be provided by libreoffice"
+ ewarn "Some java libraries will be provided internally by libreoffice"
ewarn "during the build. You should really reconsider enabling java"
- ewarn "useflag"
+ ewarn "use flag."
ewarn
fi
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/
@ 2011-07-18 21:56 Tomas Chvatal
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Chvatal @ 2011-07-18 21:56 UTC (permalink / raw
To: gentoo-commits
commit: bbe71cbb74c9e01f36112636385462e61db76d7d
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:53:48 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:53:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=bbe71cbb
[app-office/libreoffice] This damn patch does not need to be conditional.
---
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-3.4.2.1.ebuild | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f144abb..f6e09fe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19147 RMD160 d89b0d0360a028f3a2b12ddb59453086c8f1f80b SHA1 44b8ecb3e6ca46b383d51a9c456bbe14f8243fb7 SHA256 232bc808918c8f3c204189ab7a93f56ce6b4f9360d496d96aeb5734e677d6be6
+EBUILD libreoffice-3.4.2.1.ebuild 19096 RMD160 d5842ce8728df020a4e746ab5869278b1b54377c SHA1 8de5ee0c068c685b4662c877c511e3f0dff320f8 SHA256 41f5efa4be7e97399ac6ea06ebcf00ddc4fdd6bbfd1345f54f0465fa7884d020
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index b4c1b1c..fa2d273 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -213,6 +213,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
"${FILESDIR}/${PN}-libdb5-fix-check.diff"
"${FILESDIR}/${PN}-3.4.1-salfix.diff"
+ "${FILESDIR}/sdext-presenter.diff"
)
# Uncoment me when updating to eapi4
@@ -313,10 +314,7 @@ src_prepare() {
export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
fi
- # Some fixes for our patchset
- use java && epatch "${FILESDIR}/sdext-presenter.diff"
base_src_prepare
-
eautoreconf
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2011-07-23 9:55 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-22 22:06 [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-07-23 9:55 Tomas Chvatal
2011-07-22 22:55 Tomas Chvatal
2011-07-22 22:48 Tomas Chvatal
2011-07-22 21:43 Tomas Chvatal
2011-07-22 15:39 Tomas Chvatal
2011-07-21 20:26 Tomas Chvatal
2011-07-21 15:22 Tomas Chvatal
2011-07-21 12:34 Tomas Chvatal
2011-07-21 11:17 Tomas Chvatal
2011-07-20 17:41 Tomas Chvatal
2011-07-20 12:40 Tomas Chvatal
2011-07-19 13:30 Tomas Chvatal
2011-07-19 13:30 Tomas Chvatal
2011-07-19 12:23 Tomas Chvatal
2011-07-18 21:56 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox