From 5a4c0512a6af3e362470c2d3c66c64316ae568a8 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 8 Jun 2012 15:06:55 +0000 Subject: fix doicon mess, bug #420117 by Richard Freeman (Portage version: 2.2.0_alpha110/cvs/Linux x86_64) --- app-office/lyx/ChangeLog | 6 +++++- app-office/lyx/lyx-1.6.10.ebuild | 6 +++--- app-office/lyx/lyx-2.0.3.ebuild | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index 8f434fb0501b..5ced7e427f36 100644 --- a/app-office/lyx/ChangeLog +++ b/app-office/lyx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/lyx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.262 2012/05/28 15:58:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.263 2012/06/08 15:06:55 aballier Exp $ + + 08 Jun 2012; Alexis Ballier lyx-1.6.10.ebuild, + lyx-2.0.3.ebuild: + fix doicon mess, bug #420117 by Richard Freeman 28 May 2012; Raúl Porcel lyx-2.0.3.ebuild: alpha/ia64/sparc stable wrt #411941 diff --git a/app-office/lyx/lyx-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild index c6f38023236a..ecb179a5b655 100644 --- a/app-office/lyx/lyx-1.6.10.ebuild +++ b/app-office/lyx/lyx-1.6.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.10.ebuild,v 1.10 2012/05/03 20:00:39 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.10.ebuild,v 1.11 2012/06/08 15:06:55 aballier Exp $ EAPI=2 @@ -124,8 +124,8 @@ src_install() { doins "${T}"/hebrew.bind || die fi - doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png" - make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;" + newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;" # fix for bug 91108 if use latex ; then diff --git a/app-office/lyx/lyx-2.0.3.ebuild b/app-office/lyx/lyx-2.0.3.ebuild index 6efabaed0c50..ff410b4d494e 100644 --- a/app-office/lyx/lyx-2.0.3.ebuild +++ b/app-office/lyx/lyx-2.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.3.ebuild,v 1.10 2012/05/28 15:58:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.3.ebuild,v 1.11 2012/06/08 15:06:55 aballier Exp $ EAPI=3 @@ -129,8 +129,8 @@ src_install() { doins "${T}"/hebrew.bind || die fi - doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png" - make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;" + newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;" # fix for bug 91108 if use latex ; then -- cgit v1.2.3-65-gdbad