Desktop entry with icon.

Package-Manager: portage-2.1.5.2

4 files changed, 9 insertions, 55 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index fe03e6108083..0fff31784b4b 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/highlight
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.18 2008/05/23 14:12:21 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.19 2008/05/26 15:20:39 drac Exp $
+
+  26 May 2008; Samuli Suominen <drac@gentoo.org> highlight-2.6.10.ebuild:
+  Desktop entry with icon.
 
 *highlight-2.6.10 (23 May 2008)
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 5bccacdbd867..644238b3d3ce 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -3,9 +3,7 @@ AUX highlight-2.6.9-asneeded.patch 946 RMD160 f45810d93d5c7365e055fe5735c3f76d7a
 AUX highlight-2.6.9-gcc43.patch 492 RMD160 37c2907fd2b0f008175865980bdf1d966e23e803 SHA1 6cef4b90567229ad2b9041462736545e397fdbd2 SHA256 f75e28b9d8cf299ee7cf3fbd38db340343225a3badf950423810bf400da050a0
 DIST highlight-2.4.8.tar.bz2 315760 RMD160 a2623a2f5102fae1d9f5712a504876a55eda9c81 SHA1 091689fde96c9f4e3de75ea1b7c1838e8d25708c SHA256 e661b347222e5701930c697ff74c17ad8d65166bf34cb72b2041bb2e2e9c9aec
 DIST highlight-2.6.10.tar.bz2 397860 RMD160 20cfb4a142a4297da25e37e1b8a404bc9ea98376 SHA1 8b4fe442a7591ae9fe97a94ff6fc0930edc25e39 SHA256 2a47ba938e3eb06e6f11b503c216e5e732508feccf468215b8b44b75539cc2a1
-DIST highlight-2.6.9.tar.bz2 396590 RMD160 9d8b93183789e5571a168f486fbc0076043fe0ad SHA1 fb1ee2e404d63a3ec362ead50b20f0912aa7b48f SHA256 376376c19258c156d1f64ee9388283a050e894b55404725616739b7492159708
 EBUILD highlight-2.4.8.ebuild 628 RMD160 f79ada21302c8907e1a09fa863682a32ee8592db SHA1 1e3054b7d36fdbaaafb954f7486f87f73852d43c SHA256 3e82142ddfe8b8af3ccdadbacaf9cfd3d3ec1bade8c3d668c057e3b30d83879b
-EBUILD highlight-2.6.10.ebuild 1328 RMD160 571ccb8b66ace28f403b8aea73b188b404f82d8e SHA1 611d5591f666f95427b6fe95d3283fd210769d23 SHA256 e66d767b23c5405f599d801c21e92def1b07457f4cf0c6410d7676f972240acb
-EBUILD highlight-2.6.9.ebuild 1275 RMD160 2cc92236f054f1ee5f5d55fdea73928ae28cedc4 SHA1 04529bf136f57e3d3f147ff65b883f808c67965c SHA256 e2c4fbdadb3047473e66b7f3c70aa3169f0647826326a381b1ada85b921dcdee
-MISC ChangeLog 2529 RMD160 f365eba1ef700e72d7e7173954bcab9ea017b744 SHA1 f6afd00eada6f97f473eec7179bfe27352cc310c SHA256 9210190202f1483eef07e5f16aac5de5b9c3c0573589daeb83a7cab28dc385ca
+EBUILD highlight-2.6.10.ebuild 1422 RMD160 404231ca07f39f59a26ce9a3a618d60f9fbbd302 SHA1 089c726c026df74bc3e821a7de020c6bf3e20084 SHA256 569e5fc437a0bab6387dd90db42385e98762d68f200a467c6753539a747dbe4c
+MISC ChangeLog 2631 RMD160 e1c4275cd1808a63dd959e29ea5546bde07f6c76 SHA1 7d29a2510e6f6dccbf3ecfe0885d50bdba5c251b SHA256 4ecc6c3a7de4828743275c44bb61ab0768cc95e9fde25561c15f92194a9754ec
 MISC metadata.xml 178 RMD160 7a7e1fa5fc747be92ff6d87c7e43c2909bf3c5d7 SHA1 6f35e3eb98d5da19aa894ba2478aabb2698037c6 SHA256 d0798c610b068ab759a9ecfa6fedaa735750e718c770783216ad5ea76e0020ba
diff --git a/app-text/highlight/highlight-2.6.10.ebuild b/app-text/highlight/highlight-2.6.10.ebuild
index e5098b486605..b0b62079e0d1 100644
--- a/app-text/highlight/highlight-2.6.10.ebuild
+++ b/app-text/highlight/highlight-2.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.6.10.ebuild,v 1.1 2008/05/23 14:12:21 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.6.10.ebuild,v 1.2 2008/05/26 15:20:39 drac Exp $
 
 WX_GTK_VER=2.6
 
@@ -46,5 +46,7 @@ src_install() {
 		emake -f makefile \
 			DESTDIR="${D}" \
 			install-gui || die "emake install-gui failed."
+		doicon src/gui/${PN}.xpm
+		make_desktop_entry ${PN}-gui Highlight ${PN} "Utility;TextTools"
 	fi
 }
diff --git a/app-text/highlight/highlight-2.6.9.ebuild b/app-text/highlight/highlight-2.6.9.ebuild
deleted file mode 100644
index 38162c92fb32..000000000000
--- a/app-text/highlight/highlight-2.6.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.6.9.ebuild,v 1.4 2008/05/05 12:34:07 drac Exp $
-
-WX_GTK_VER=2.6
-
-inherit wxwidgets eutils toolchain-funcs
-
-DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="wxwindows"
-
-DEPEND="wxwindows? ( =x11-libs/wxGTK-2.6* )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-asneeded.patch
-	sed -i \
-		-e "s:-O2::" \
-		-e "s:CFLAGS:CXXFLAGS:g" \
-		src/makefile || die "sed failed."
-}
-
-src_compile() {
-	emake -f makefile CXX="$(tc-getCXX)" all || die "emake all failed."
-	if use wxwindows; then
-		need-wxwidgets ansi
-		emake -f makefile CXX="$(tc-getCXX)" all-gui || die "emake all-gui failed."
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	emake -f makefile \
-		DESTDIR="${D}" \
-		install || die "emake install failed."
-	if use wxwindows; then
-		emake -f makefile \
-			DESTDIR="${D}" \
-			install-gui || die "emake install-gui failed."
-	fi
-}