From 2ea3ee2cb776aa7f8a96a1b54a8b6fe496b40282 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sat, 29 Oct 2005 21:41:50 +0000 Subject: [PATCH] some cleanups and reorganizations to the ebuild Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice-bin/ChangeLog | 11 ++++++- app-office/openoffice-bin/Manifest | 4 +-- .../openoffice-bin-2.0.0.ebuild | 32 +++++++------------ 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index 13e03aa58f67..711f57f640c4 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.107 2005/10/23 21:33:02 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.108 2005/10/29 21:41:50 suka Exp $ + + 29 Oct 2005; Andreas Proschofsky + openoffice-bin-2.0.0.ebuild: + Some reorganizations to be more in-line with the source-based build, further + cleanups include the mime and icon stuff. This also removes the need for the + "kde" use-flag. And don't believe what someone else is telling you, there + never was any kde-integration in openoffice-bin (so it wasn't removed now ;) + ), if you want this you'll have to use app-office/openoffice until upstream + decides to package this. 23 Oct 2005; Andreas Proschofsky openoffice-bin-2.0.0.ebuild: diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 186f1967ef1f..b5f954c3e3aa 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -1,8 +1,8 @@ -MD5 90ae81366a99e3df553aefb4d6208916 ChangeLog 18913 +MD5 5dbff3387678bd0f1c7a0731194f82a2 ChangeLog 19416 MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 MD5 2919847c6afebe7fd157c48e78fb5770 files/2.0.0/ooo-wrapper2 3703 MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82 MD5 72776dcacfb2853f6056793f531d7986 files/digest-openoffice-bin-2.0.0 4709 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718 -MD5 34487da84a650ef6706e8f5faaa80842 openoffice-bin-2.0.0.ebuild 7064 +MD5 daa0fd138bd7481b6fa8a6a2372a7492 openoffice-bin-2.0.0.ebuild 6748 diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild index 6fce23465012..ab016bb95c94 100644 --- a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild,v 1.2 2005/10/23 21:33:02 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild,v 1.3 2005/10/29 21:41:50 suka Exp $ inherit eutils fdo-mime rpm multilib -IUSE="gnome java kde" +IUSE="gnome java" MY_PV="${PV}rc2" MY_PV2="${MY_PV}_051005" @@ -100,7 +100,6 @@ src_unpack() { done rpm_unpack ${S}/desktop-integration/openoffice.org-freedesktop-menus-${PV}-3.noarch.rpm - use kde && rpm_unpack ${S}/desktop-integration/openoffice.org-suse-menus-${PV}-3.noarch.rpm use gnome && rpm_unpack ${S}/openoffice.org-gnome-integration-${PV}-3.i586.rpm use java && rpm_unpack ${S}/openoffice.org-javafilter-${PV}-3.i586.rpm @@ -126,24 +125,24 @@ src_install () { einfo "Installing OpenOffice.org into build root..." dodir ${INSTDIR} - dodir /usr/share/icons - dodir /usr/share/mime mv ${WORKDIR}/opt/openoffice.org2.0/* ${D}${INSTDIR} - mv ${WORKDIR}/usr/share/icons/* ${D}/usr/share/icons - use kde && dodir /usr/share/mimelnk/application && mv ${WORKDIR}/opt/kde3/share/mimelnk/application/* ${D}/usr/share/mimelnk/application - - #Menu entries + #Menu entries, icons and mime-types cd ${D}${INSTDIR}/share/xdg/ - sed -i -e s/'Exec=openoffice.org-2.0-printeradmin'/'Exec=oopadmin2'/g printeradmin.desktop || die - for desk in base calc draw impress math writer printeradmin; do + for desk in base calc draw impress math printeradmin writer; do mv ${desk}.desktop openoffice.org-2.0-${desk}.desktop sed -i -e s/openoffice.org-2.0/ooffice2/g openoffice.org-2.0-${desk}.desktop || die + sed -i -e s/openofficeorg-20-${desk}/ooo-${desk}2/g openoffice.org-2.0-${desk}.desktop || die domenu openoffice.org-2.0-${desk}.desktop + insinto /usr/share/pixmaps + newins ${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg-20-${desk}.png ooo-${desk}2.png done + insinto /usr/share/mime/packages + doins ${WORKDIR}/usr/share/mime/packages/openoffice.org.xml + # Install wrapper script newbin ${FILESDIR}/${PV}/ooo-wrapper2 ooffice2 sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice2 || die @@ -159,17 +158,8 @@ src_install () { # Change user install dir sed -i -e s/.openoffice.org2/.ooo-2.0/g ${D}${INSTDIR}/program/bootstraprc || die - # Fixing some icon dir permissions - chmod 755 -R ${D}/usr/share/icons/ || die - - # Icon symlinks for gnome - dodir /usr/share/pixmaps - for app in base calc draw impress math printeradmin writer; do - dosym /usr/share/icons/gnome/32x32/apps/openofficeorg-20-${app}.png /usr/share/pixmaps/openofficeorg-20-${app}.png - done - # Non-java weirdness see bug #99366 - use java || rm -f ${D}${INSTDIR}/program/javaldx + use !java && rm -f ${D}${INSTDIR}/program/javaldx } pkg_postinst() { -- 2.26.2