From e872964f52d8757bdcb09f1dbfb7f7d5e8eec704 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 25 Jul 2011 14:54:33 +0000 Subject: [PATCH] Do not pre-strip the binaries, check for proper reqs, update install phase to use distro-pack-install (smaller yay). Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 7 ++- app-office/libreoffice/Manifest | 10 ++-- .../libreoffice/libreoffice-3.4.2.2.ebuild | 55 ++----------------- 3 files changed, 16 insertions(+), 56 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 3a9234d1652b..ba8ff02e1115 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.49 2011/07/25 12:12:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.50 2011/07/25 14:54:33 scarabeus Exp $ + + 25 Jul 2011; Tomáš Chvátal + libreoffice-3.4.2.2.ebuild: + Do not pre-strip the binaries, check for proper reqs, update install phase to + use distro-pack-install (smaller yay). 25 Jul 2011; Tomáš Chvátal files/libreoffice-solenv-build-crash.patch: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index bddff582b7b5..17a5af3facf5 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -208,13 +208,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274 -EBUILD libreoffice-3.4.2.2.ebuild 18777 RMD160 b86b290230b499ebb29e47d6f87d2277e696ac70 SHA1 e24a72b06fce79284f0563fcf657741ed5a5b18c SHA256 8e210006ebcb7d621f4b662c8064661457164d060208eb5a1a51d5aea3895f05 -MISC ChangeLog 10098 RMD160 8371fb23629d47f84e7c7a5396870fcc730545d9 SHA1 8156943aef36c3628350200b7936502ac94d64c4 SHA256 3f789a99101b7183c101170575a12cb2f287b29bef020739c69933ca0c3c6a24 +EBUILD libreoffice-3.4.2.2.ebuild 17540 RMD160 8b9ec1740c118ab0a6737ae50eb2fa4a4a59bcc0 SHA1 ad7918644ceff368a249234fdab05f938d1581dc SHA256 e00ff492905344daf8c1fbadb2ccb2b240e47a841f3373ecf3d5f95df1c68a05 +MISC ChangeLog 10305 RMD160 12d01c6b9518a9026ca2c2ba0970b96d6c408532 SHA1 ca6f897b82ef796995e93d5c6d83a6186106b0d9 SHA256 d21c3ad6c200d2ce7c8f38f45c1450fd091a49557b732a788f367e48348cc552 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4tXYkACgkQHB6c3gNBRYd5OwCgk6Exkgo9SnsuA/2QtZ2Ee6cj -rUkAn3J1Ip9Vf80a8Axs6tz2O+k2aQ2Q -=xGG2 +iEYEARECAAYFAk4tg2gACgkQHB6c3gNBRYdkZwCfYGZOrBEHIKeeu3vYZGTI9igF +uBMAn1hlCCTLXcbVefRwHW0acEdvFhoO +=ZtY7 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index a16e090f4d65..429278dcdbe2 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild @@ -1,6 +1,6 @@ # 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.2.2.ebuild,v 1.8 2011/07/25 11:19:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.9 2011/07/25 14:54:33 scarabeus Exp $ EAPI=3 @@ -271,8 +271,8 @@ pkg_setup() { ewarn "If you encounter errors try yourself to disable parallel build." # Check if we have enough RAM and free diskspace to build this beast - CHECKREQS_MEMORY="512" - use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144" + CHECKREQS_MEMORY="1024" + use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216" check_reqs } @@ -457,7 +457,6 @@ src_configure() { $(use_enable cups) \ $(use_enable dbus) \ $(use_enable debug crashdump) \ - $(use_enable !debug strip-solver) \ $(use_enable eds evolution2) \ $(use_enable gnome gconf) \ $(use_enable gnome gio) \ @@ -491,52 +490,8 @@ src_compile() { } src_install() { - local SIZE desk app - - export PYTHONPATH="" - - emake DESTDIR="${D}" install || die - - # Fix the permissions for security reasons - use prefix || chown -RP root:0 "${ED}" - - # Desktop files - pushd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/ > /dev/null - for i in *; do - mv ${i}.desktop ${PN}-${i}.desktop - done - popd > /dev/null - sed -i \ - -e s/libreoffice3.4/${PN}/g \ - -e s/libreoffice34/${PN}/g \ - "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop || die111 - use java || rm "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/javafilter.desktop - domenu "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop - - # install icons - insinto /usr/share/icons/ - doins -r "${S}"/sysui/desktop/icons/hicolor - - # app icon names are too generic, have to make them unique - for SIZE in 16 32 48 128 ; do - cd "${ED}"/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - for app in base calc draw impress main math startcenter writer ; do - mv ${app}.png ${PN}-${app}.png || die - done - done - - # install mime package - dodir /usr/share/mime/packages - cp sysui/*.pro/misc/${PN}/openoffice.org.xml \ - "${ED}"/usr/share/mime/packages/${PN}.xml - - # Install wrapper script - sed -i -e s/LIBDIR/$(get_libdir)/g "${T}/wrapper.in" || die - newbin "${T}/wrapper.in" ${PN} || die - - # Cleanup after playing - rm "${ED}"/gid_Module_* - + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install || die } pkg_preinst() { -- 2.26.2