diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-07-23 22:58:49 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-07-23 22:58:49 +0000 |
| commit | 0438fbd56a4454f1d900fdc73d911eb0781f0afa (patch) | |
| tree | 2ed78a094ee39109a11f4763ef1c185fa34f6ab0 /app-office | |
| parent | Version bump. Also fixes bug #456066 and bug #476088. (diff) | |
| download | historical-0438fbd56a4454f1d900fdc73d911eb0781f0afa.tar.gz historical-0438fbd56a4454f1d900fdc73d911eb0781f0afa.tar.bz2 historical-0438fbd56a4454f1d900fdc73d911eb0781f0afa.zip | |
Fix printeradmin, bug #437530. Remove javaldx again if not needed.
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index 0245a037c0a5..4ebe29043a45 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.262 2013/07/23 22:42:25 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.263 2013/07/23 22:58:46 chithanh Exp $ + + 23 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + openoffice-bin-4.0.0.ebuild: + Fix printeradmin, bug #437530. Remove javaldx again if not needed. *openoffice-bin-4.0.0 (23 Jul 2013) diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 1dedb56836fd..89d4d6c5bdd5 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -87,6 +87,6 @@ DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86_langpack-rpm_sl.tar.gz 1262587 DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86_langpack-rpm_zh-CN.tar.gz 13926004 SHA256 7cbc07cc7009b8594142477e3644d3b1ad633547d8007f3775460b5b67c85ead SHA512 64b0f81ded092f0fb2efbd47edbf68b1bfe7528ae5b41304991e88a937019795fa1360a13b6c4f9535e3a0e8e1bd72989e0ef81270e91a1bcb79dd81a003f5e2 WHIRLPOOL 29c4b07299faabf2e9ae86d23e22c96d487a468d8ccaf7d041e24ce33817a2eb5f5c7db5c396971424ee6ecf8dd4c7eee723df7deeca5b2fc58e818542c8f855 DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86_langpack-rpm_zh-TW.tar.gz 14137188 SHA256 15e44f1bbea48bf6132cc3577e44df30d32ad19051be9da0b2d01afe6eb9f891 SHA512 65cb7982966ce33f26f294da62c65ff3cbb2d91223f9f6231b8e10ad6da54364a784c6eda82522afe5e89d40bc241157ddd1c1cbcf6bea36be4a6faa77b4b8b6 WHIRLPOOL 1d42d687f17d8ac6d01034e9729f9ffd7c37cadfbb26a6c943f1c6b8de4e91b1f581ad2b79eec64ad11a2862e02e33e4f42b5a3c14928e8b67647985de43b273 EBUILD openoffice-bin-3.4.1.ebuild 6292 SHA256 4124b8c04894c594eaa2f7de04f9f6042781ebc2cbed5addaa58806cd685f908 SHA512 59674412b0ec220faa96f3f0f4ed947e07fde05fe2558f7d9ea80f4153842a1d8fda868520d0579e1c77a9715e96a0348456b5150191cd6975baa666d7aa126c WHIRLPOOL 575d5f756c17cb7780dac8cfb2ac4477f8d83af8c3bdc31b533ac479e5ff188cd2ec4062df78cd5ccd50723eb61e59884da50cc5d15becdc93d57ff0fd7e5edb -EBUILD openoffice-bin-4.0.0.ebuild 5286 SHA256 e9c257a062d4e0c4cae7718f81e89a69be053bcacfda92509b379ee5db7f3173 SHA512 72a416aadc87e677d2d123e49820572a341565f8c04121e988df94109b5867b6246236c2283ba8e4cf8ffb4a27620737f1e7f0d10498d5fe233864778fef060e WHIRLPOOL caa2484ec3105c167bae39aa39670bb4fadd6c89d9ce97bb900ef2b70b8133e00e39f6f1337020a8a17b5147f7f9f3805c186a7972defc7f9042031d69692759 -MISC ChangeLog 46012 SHA256 8dd9259f6c1b1db7ed04276c671305e4c387b716775d1909138f0b9c08a55d9c SHA512 97637351f2481b92a143695e7fd3e1ece801654d6720d59e0da0312b1d2fbddb4ef96a8c1178a119caadafd2b95b91b2765d319e40a9707a91f5a8c7535ba978 WHIRLPOOL 15e5ef86e1ac293f97e73d6f1296967c9cd756592edda0016f12744673e58fdfa016d8138609e9eb4a412d615ff696d4c824a6781a61341814b8efff6b09e287 +EBUILD openoffice-bin-4.0.0.ebuild 5379 SHA256 94648dbaaf49f2f95cda7e41a9c0de806f0d93f12448644aa9a83dd4f2bdce3b SHA512 64a2508c4f7cbc4e24ff4fa7f33a1386806f56a35b8e943fbffdd41288d75b0c21bcb1b896b7960f86479371e8e6602a018d2fb7c8fe6309782007021add5076 WHIRLPOOL 66969db6eb098653047fde66cf1efaa2237e152b856d5297fab1434f11006e582634a54174a423ad5a0c21c92b517c55560749270b40158b5fa928dc86eac0ce +MISC ChangeLog 46182 SHA256 e5426e2991c3b1286cd089ea9b4c3b32498852c92bc706dc36373e6d9623367a SHA512 ef7f04056f39b5b54ef0a8cb37f6f95e5a088c43163d4869ddc4b4abdd47aa106440945b8a92c24613d6db0477582197adfb690bd5297bddcc15e7e3330c3c6c WHIRLPOOL efd00abd129da4b98fb2d7913d438280f078e1854ca43033e593c917bd54f0b1b433ffe403db6acd8b58b9c42e1f3e3e7045e727d8e95870173e974624dc896c MISC metadata.xml 543 SHA256 9c8d2e08d16049c1965d17844c3116d9081825e9981667e081da61054bc4db82 SHA512 8e89f4f7ae9c19d903678fd90b46b123788138fc1d59d8e8ec8db8adfbc512af820367a602310bb64e5a71925887879e64166ab37a7bccd2b74c4ffed80c03bd WHIRLPOOL 545646bbe99f5a3c56c7105e73f1c8a1044b5b410c4e1b5b6342297cfa1257ba1279fff44f7c1951926a79c598c656771297cbf20a6f8ed753c8bfc479cca9f5 diff --git a/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild b/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild index 3b4c587bf410..1b60c5ef682d 100644 --- a/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild,v 1.1 2013/07/23 22:42:25 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-4.0.0.ebuild,v 1.2 2013/07/23 22:58:46 chithanh Exp $ EAPI="4" @@ -148,6 +148,9 @@ src_install () { dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin dosym ${INSTDIR}/program/soffice /usr/bin/soffice + # Non-java weirdness see bug #99366 + use !java && rm -f "${ED}${INSTDIR}/program/javaldx" + # prevent revdep-rebuild from attempting to rebuild all the time insinto /etc/revdep-rebuild && doins "${T}/50-${PN}" @@ -158,7 +161,7 @@ src_install () { # libreoffice cd "${ED}${EPREFIX}/usr/bin/" for i in oo*; do - [[ ${i} == ooffice ]] && continue + [[ ${i} == ooffice* ]] && continue rm ${i} cat >> ${i} << EOF |