From 2594fceb9148e40f82d4317af56ec6e691fc91ef Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 18 Oct 2011 07:33:46 +0000 Subject: [PATCH] Bump live versions to eapi4. Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 +++- app-office/libreoffice/Manifest | 32 +++++++++---------- .../libreoffice-3.4.9999-r1.ebuild | 19 ++++++----- .../libreoffice/libreoffice-9999-r1.ebuild | 25 +++++++++------ 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 21f745eb6bb7..24356fade47e 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.174 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.175 2011/10/18 07:33:46 scarabeus Exp $ + + 18 Oct 2011; Tomáš Chvátal + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: + Bump live versions to eapi4. 16 Oct 2011; Tomáš Chvátal libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 17cc1c79310b..aef7e8be2081 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -152,24 +152,24 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1 EBUILD libreoffice-3.4.3.2-r1.ebuild 18446 RMD160 ea7208dc6ed726a698cdd68c96be0417eed323fa SHA1 b82fc9f6ee1215215fdc80f40c76307c9792b459 SHA256 629940b89965508ad7de68acd9a770b10c4d53e8d11b8bd769a7777aded1ef3a -EBUILD libreoffice-3.4.9999-r1.ebuild 16325 RMD160 7bd319c1afab431c5842176819a040376f117c7b SHA1 3bd898594ab0fd323ae25d152e181a59fce40297 SHA256 71970e10a5a65de5a1dfa9a0f5149576438d754719afb2935612904b4677d5c4 -EBUILD libreoffice-9999-r1.ebuild 14490 RMD160 fc54cf41bd12c082f8ca4bf0df8e1db20610f9a1 SHA1 d5ec9cc752859bc70aa5510c7370e3fde7eb66de SHA256 1c4f842eb568f6fe476386db5344321c86a28711269065d9d0e17c37090b3fdd -MISC ChangeLog 31931 RMD160 e1100cd5a1e2517cf91dc9d466235c9d155dbc0f SHA1 c3f01bf016c47de6eb49d6c75634799f5ec975e2 SHA256 6d80966d98b324fa91acc1a0a91c5fdac770aefdc8650a0ebea7bbf7d6f98f6e +EBUILD libreoffice-3.4.9999-r1.ebuild 16268 RMD160 e5761718776c50718f95994f9267e580c26754ea SHA1 d9d73a174061bde64426edeb41c7da178d84fb8e SHA256 fcb0f133d36ca7475a781ff1c80b2d7f238829f561c80630d5564598069a7d9b +EBUILD libreoffice-9999-r1.ebuild 14567 RMD160 c33f48de9b4a5de4d2299a2872fa3f6b7e34cc8d SHA1 e1445e9ce254b2bf46998b061de000bb79be8153 SHA256 46baa93007337c9fe9882e5c1b585bdd4c2e3a82a4156046dddae18a495ff5e9 +MISC ChangeLog 32080 RMD160 5f6beef2aa09afa227fbde5fec8deffd6cadde46 SHA1 a3804eb7a883d8492dbb9d342f8be89aa57fa8e5 SHA256 d5c48d51bea41d950b70545f8eb02cf2693771018360b8b4904b92635b6eaa51 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOmxuwAAoJEOSiRoyO7jvoMsgP/1Q4lAEXsiTG7NL/ZkhrqYcx -tmgQvKB1maTl8hNKuAdKdMqZGI4LadyZ1g1w9aPbFNOH4+gydjXC3+bCYWDUa2It -iKAXrkWfGQlr2/drCd6sShO0j6PGsDi0QsyU4lIpoQYvaRONWyq528EvK9IYMhRQ -0hszqMqoIlUZWkT+vJlNdgR1WZvVSHGOD8V1naeY5dYUvuWkmEycLMm00PCbtWzO -6zeK+8JF8Ziffs+pPOzvHMmTY8yE5j2oOTB50AxHMYiNVdcCV4uarpIzSdED/63q -H5Wtq2bjs53/aI4oSNYDm9F1giFZHpOX25JQ6mXUo90upb0fs6EZvcYmtrxYWDmQ -fFJMvjM0P72Qvq9LhRNLRZ7yyNMoFX8yO+HezvyiFeWIYrNbf0MBjclTZmfdiCTC -72P1lvlxg5vBWOZ0sIViouEY31LdPGNbpXyZYd3qO0Ntqn/4RenNdW2wmpj171v1 -xFBAoShFAkFwRLklW0Wdl8Lu/gPKmtlp7rUNTPYrgsQY1XbFoE+AL5bk7fVXu814 -St2bNh3B5K8t/8B/GtwiQ539nw5L+sBagU/LPm6t3fjK/c4ObCmR7K/Fw/6Exi+P -PV1hRCAuyvo9bZrgeVd3FFzeooeW+o3yeyRxJxcydcYk+JhH+s+EBrEOIpaGRFsD -/ccj9fflLkJ0ADbWvhlw -=jEig +iQIcBAEBAgAGBQJOnSvyAAoJEOSiRoyO7jvoJ4QQAKXQiZFNbCVQHpNrcEWr7gJi +MapfXLficJvs07FMYgM9TLWMpRx27dN3I6/Ly50ME4gtU/b5orCVkRubYsyVwDP2 +rYITF3aOsf+kUf18dcqyKq1bDAWsZUszmMSlWJqJXSD8BxRoxlluGnQw79P5xPG3 +j+mYI25VYSiLS5cxJv24q/5W6xyOcoQCUAYuf9NfrfdxqJzVnV0X40idiUu6nk3G +mRwxNHnywLrzwsw91PcmwtN1JL2UBuc2OHB8Xw0CUemJ1FVzaYD5vlNflF2wgYz2 +WU4UJcR2G293eA1v3mbgy2+30N94CBAimEtdBhtYgbbuJSCf74Nv4r3n/8TkvoWw +fmTN3m1TIQr22cpwGPue8AEe9TnQQ3chPdcxHtctuGhyjmmrvuCFdoOlDnCt9jG2 +1GOBrhmSjAmn8llD3DNMNgpUvmk1Ff3OwRWuDwh3BOVHN9AX+Xx24Q5lr3iGUsTh +KP4pKPMAaQnOTS7eb+bBlm/YRKBezd4BXuFhXCRyZzXPJ8o0OwbxuYLo34uVe1UI +RGJwNxqVs77+Jl+mMKvTZEhS1fXcKM02Eq+DE8Nb+0bpWBh3x4P3Ej6BG9DKx2bp +slv8UOLdAwc06In2l0ydXztkGFRqcjoNykPLrRjWBskoxVWJNczJszi0m+bKWSEB +997vkUaO9SGy7QL1vDyC +=64qQ -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild index d750bd6cea4f..3235ac180e79 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.14 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.15 2011/10/18 07:33:46 scarabeus Exp $ -EAPI=3 +EAPI=4 KDE_REQUIRED="optional" KDE_SCM="git" @@ -206,12 +206,11 @@ PATCHES=( "${FILESDIR}/${PN}-java.patch" ) -# Uncoment me when updating to eapi4 -# REQUIRED_USE=" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" # Needs lots and lots of work and compiling RESTRICT="test" @@ -505,7 +504,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install || die # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} rm -rf "${ED}"/etc/ # symlink the plugin to system location @@ -515,7 +514,7 @@ src_install() { if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index fa6b0a5c0bf5..548f3915a468 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.43 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $ -EAPI=3 +EAPI=4 KDE_REQUIRED="optional" KDE_SCM="git" @@ -200,15 +200,20 @@ DEPEND="${COMMON_DEPEND} PATCHES=( ) -# Uncoment me when updating to eapi4 -# REQUIRED_USE=" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" S="${WORKDIR}/${PN}-core-${PV}" +pkg_pretend() { + CHECKREQS_MEMORY="1G" + use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G" + check-reqs_pkg_setup +} + pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup @@ -461,7 +466,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} rm -rf "${ED}"/etc/ # symlink the plugin to system location @@ -471,7 +476,7 @@ src_install() { if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } -- 2.26.2