[gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild

["Andreas Proschofsky (suka)" <suka@gentoo.org>]

suka        11/03/17 11:47:50

  Modified:             ChangeLog openoffice-bin-3.3.0.ebuild
  Log:
  Properly install all sizes of app and mimetype icons
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.238                app-office/openoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.237&r2=1.238

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog	16 Mar 2011 23:31:55 -0000	1.237
+++ ChangeLog	17 Mar 2011 11:47:50 -0000	1.238
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.237 2011/03/16 23:31:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.238 2011/03/17 11:47:50 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Properly install all sizes of app and mimetype icons
 
 *openoffice-bin-3.3.0 (16 Mar 2011)
 



1.2                  app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild?r1=1.1&r2=1.2

Index: openoffice-bin-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice-bin-3.3.0.ebuild	16 Mar 2011 23:31:55 -0000	1.1
+++ openoffice-bin-3.3.0.ebuild	17 Mar 2011 11:47:50 -0000	1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.1 2011/03/16 23:31:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.2 2011/03/17 11:47:50 suka Exp $
 
 EAPI="3"
 
-inherit eutils fdo-mime pax-utils prefix rpm multilib
+inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
 
 IUSE="gnome java kde"
 
@@ -138,17 +138,17 @@
 
 	#Menu entries, icons and mime-types
 	cd "${ED}${INSTDIR}/share/xdg/"
-
-	for desk in base calc draw impress math printeradmin qstart writer; do
+	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
 		mv ${desk}.desktop openoffice.org-${desk}.desktop
 		sed -i -e s/openoffice.org3/ooffice/g openoffice.org-${desk}.desktop || die
-		sed -i -e s/openofficeorg3-${desk}/ooo-${desk}/g openoffice.org-${desk}.desktop || die
 		domenu openoffice.org-${desk}.desktop
-		insinto /usr/share/pixmaps
-		if [ "${desk}" != "qstart" ] ; then
-			newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg3-${desk}.png" ooo-${desk}.png
-		fi
 	done
+	insinto /usr/share
+	doins -r "${WORKDIR}"/usr/share/icons
+	doins -r "${WORKDIR}"/usr/share/mime
 
 	# Make sure the permissions are right
 	use prefix || fowners -R root:0 /
@@ -179,10 +179,17 @@
 
 }
 
+pkg_preinst() {
+
+	use gnome && gnome2_icon_savelist
+
+}
+
 pkg_postinst() {
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	use gnome && gnome2_icon_cache_update
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin
 
@@ -197,3 +204,10 @@
 	elog
 
 }
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	use gnome && gnome2_icon_cache_update
+
+}