diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-20 14:37:09 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-20 14:37:09 +0200 |
| commit | f7d480b41d3acdd0b58b8b504e9e1685acde52bf (patch) | |
| tree | d002ab1cc5888c6f6a4ab4327c49b237bf9c6ff9 | |
| parent | [app-office/libreoffice] do not use system dmake and recheck all languages. (diff) | |
| download | scarabeus-f7d480b41d3acdd0b58b8b504e9e1685acde52bf.tar.gz scarabeus-f7d480b41d3acdd0b58b8b504e9e1685acde52bf.tar.bz2 scarabeus-f7d480b41d3acdd0b58b8b504e9e1685acde52bf.zip | |
[app-office/libreoffice] Make it find and copy internal libs properly.
| -rw-r--r-- | app-office/libreoffice/Manifest | 7 | ||||
| -rw-r--r-- | 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 } |