diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /app-office/openoffice-bin | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'app-office/openoffice-bin')
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 2 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 86ce9a5ae8fa..4c42ffcb994a 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -80,5 +80,5 @@ DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz 12196002 BLAKE2B b DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_vi.tar.gz 13438574 BLAKE2B 78a946da888cdda4edfcd7398386925f1e7e27ab10dc0f9d6e43b1fa7269b5282574774185e8e964fbbbc2aaf60f960862feee2927e918e46defac5b94ea604d SHA512 f406f5f4e7d21ea9031f316c73bfaa8e06f6eeb724a79db0bd38607e5dc73f043d55e37528c5d48bf7cc031bae751f792447fce70feee9ca5f2e46b738d1c7f1 DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-CN.tar.gz 13874438 BLAKE2B edb1cc8b0a6b94f7fa47166ad26f45d58774bd9567cbb6e3a1643f038d335f33f92a8ff2b2d84bc59a5b4cd020e3f68826fd9b7aacc4f1534683288c58c5cacc SHA512 722b8a1e8fb39a01dff92ccc5db61428348b4f033efa6e9d150241a2e34010444ae43dac54b8bb72b90d98304c62328db8e39cd2de8077dc49f2e1cb3a475c24 DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-TW.tar.gz 14085971 BLAKE2B fba2234bf067ebc12e691ed32800bdbabd6cb328def31dce7fbbe589437c7490b6ef6d2bbd543240c7be7be3a4bc6ef4a1685ad0c3f1ae7ed3af7a1c2268bea8 SHA512 775184deade61bc8059a5adc8ad63fec4b157491edb8c4094ec8f80b3c66f2d7de574bf20817fc3077203bdaa029f6c5e4efc4ec39f15f41ff93d760be44e213 -EBUILD openoffice-bin-4.1.6.ebuild 5194 BLAKE2B f8d899b08e596560c7342672448c83b64fab37c40de278274c79335897f9ed6dda342ff271fe8003dda52412815d7dc0daeaa609384fc0de3b2dc48c2ce0385e SHA512 e3b5f8850faad0b92dc8747a0d82341337762e77b8e247a0986bd06ea3dedbf537969065cb00c429507f5376099ccc45cace3f463f98b77a17dc0504c45118e9 +EBUILD openoffice-bin-4.1.6.ebuild 5262 BLAKE2B dab4a0426ddf27e15a763e92e970db16e696569e59310911daff5b8bd5bb75e0869463094c73b5e5c0fcf9c9bb09db964e4df5955f9193490b643b050c3118dd SHA512 a77c55ae576385290b210f3428d4576dd9280fef03935ac82afabf55fe3f642fa4b74f2127226cd53b2f8c3350ac8156858be24d3712f03a2e6d2a76ba108e08 MISC metadata.xml 654 BLAKE2B 2373a48bc130966ace2a26ec4b666e4e5c0e533922ac41be7b13983cf8a905ae8b62c59f06b0d7c0eaa0219e2eefaf0d1f1edb8b57d9ad4a37687f807401e93c SHA512 e797f235f01e6f92a5bf7f10db539429aceca40b1c2fb703b736e83ee356126671977a8145907a43e84eb05e3914923ded9b0db4d4755954d9f4f519040b7162 diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild index d3a0c2c488bb..1cf8dc185577 100644 --- a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild @@ -3,7 +3,9 @@ EAPI="6" -inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib +PYTHON_COMPAT=( python2_7 ) + +inherit eutils xdg-utils gnome2-utils pax-utils prefix python-single-r1 rpm multilib IUSE="gnome java" @@ -42,6 +44,7 @@ done LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND=" !app-office/openoffice @@ -49,7 +52,7 @@ RDEPEND=" app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 - dev-lang/python:2.7 + ${PYTHON_DEPS} >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw @@ -70,7 +73,6 @@ pkg_setup() { } src_unpack() { - unpack ${A} cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}" @@ -115,11 +117,9 @@ src_unpack() { fi done - } src_install () { - INSTDIR="/usr/$(get_libdir)/${NM}" dodir ${INSTDIR} # mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die @@ -166,24 +166,18 @@ src_install () { } pkg_preinst() { - use gnome && gnome2_icon_savelist - } pkg_postinst() { - xdg_desktop_database_update xdg_mimeinfo_database_update use gnome && gnome2_icon_cache_update pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin - } pkg_postrm() { - xdg_desktop_database_update use gnome && gnome2_icon_cache_update - } |