From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q0BgP-0002K5-OH for garchives@archives.gentoo.org; Thu, 17 Mar 2011 11:48:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55B64E049A; Thu, 17 Mar 2011 11:47:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 142D6E049A for ; Thu, 17 Mar 2011 11:47:53 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BEE91B400E for ; Thu, 17 Mar 2011 11:47:52 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 763) id BEBB920054; Thu, 17 Mar 2011 11:47:50 +0000 (UTC) From: "Andreas Proschofsky (suka)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, suka@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Directories: app-office/openoffice-bin X-VCS-Committer: suka X-VCS-Committer-Name: Andreas Proschofsky Content-Type: text/plain; charset=utf8 Message-Id: <20110317114750.BEBB920054@flycatcher.gentoo.org> Date: Thu, 17 Mar 2011 11:47:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f5c8bd0208380580321a171d42cdfef1 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 =20 (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/openoff= ice-bin/ChangeLog?rev=3D1.238&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?rev=3D1.238&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?r1=3D1.237&r2=3D1.238 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 + openoffice-bin-3.3.0.ebuild: + Properly install all sizes of app and mimetype icons =20 *openoffice-bin-3.3.0 (16 Mar 2011) =20 1.2 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuil= d file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?r1=3D1.1&r2=3D1.2 Index: openoffice-bin-3.3.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bi= n-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 $ =20 EAPI=3D"3" =20 -inherit eutils fdo-mime pax-utils prefix rpm multilib +inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib =20 IUSE=3D"gnome java kde" =20 @@ -138,17 +138,17 @@ =20 #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}" =3D "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}" !=3D "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 =20 # Make sure the permissions are right use prefix || fowners -R root:0 / @@ -179,10 +179,17 @@ =20 } =20 +pkg_preinst() { + + use gnome && gnome2_icon_savelist + +} + pkg_postinst() { =20 fdo-mime_desktop_database_update fdo-mime_mime_database_update + use gnome && gnome2_icon_cache_update =20 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.b= in =20 @@ -197,3 +204,10 @@ elog =20 } + +pkg_postrm() { + + fdo-mime_desktop_database_update + use gnome && gnome2_icon_cache_update + +}