Bump to 2.6.12. Fixes #232587. Two patches dropped as they were accepted upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 61 insertions, 3 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 72e0531d1535..71b896f28215 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2008/06/19 17:04:43 ken69267 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.24 2009/02/15 17:58:51 patrick Exp $
+
+*highlight-2.6.12 (15 Feb 2009)
+
+  15 Feb 2009; Patrick Lauer <patrick@gentoo.org> +highlight-2.6.12.ebuild:
+  Bump to 2.6.12. Fixes #232587. Two patches dropped as they were accepted
+  upstream.
 
   19 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> highlight-2.6.10.ebuild:
   amd64 stable, bug #226657
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index f6b1d124fb7e..8d43087b6028 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -3,7 +3,9 @@ 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.12.tar.bz2 406711 RMD160 18c4be331d6fd00e09b86ea79ac9cdf842e81c69 SHA1 a3f58836a5ef5d84c4a6d3640db5f82797ab9bc0 SHA256 02827dcb0905677389c4fffd8fa61fc2fe7099094a10184c2f58a0fbcfb25682
 EBUILD highlight-2.4.8.ebuild 628 RMD160 f79ada21302c8907e1a09fa863682a32ee8592db SHA1 1e3054b7d36fdbaaafb954f7486f87f73852d43c SHA256 3e82142ddfe8b8af3ccdadbacaf9cfd3d3ec1bade8c3d668c057e3b30d83879b
 EBUILD highlight-2.6.10.ebuild 1422 RMD160 352717cfb95a7a1852f40a76442c91b0598cb025 SHA1 5ff78b200ad05eb2f94baf491020aeb68fda87ff SHA256 16d5ac614ac4f24288b42ca191d3f0eda21ff9229b1bc80d954bf7a058a3354e
-MISC ChangeLog 3060 RMD160 9ca70e4ca15273f7c73f593502b597a5894a1291 SHA1 8005f67ec64ee227ffd055eb9b9829b0ed0c5352 SHA256 79e6360aa95be05b4590521e62775d3b2c507bc9b946e732b3474fbc5a462e06
+EBUILD highlight-2.6.12.ebuild 1342 RMD160 b060b3f8522f788e095f3176fb349128149cabb6 SHA1 f7f99219323401830bfb555ddf0bd8828e51978c SHA256 3a9f862c2111365052f05aedf08c686a722df54161e74faf19b0cd29000c1494
+MISC ChangeLog 3256 RMD160 b995d631703f1117813bb0d789de9d972de97d33 SHA1 a480019e0474bfa60e203d3a5c5d2fcb0c484785 SHA256 bfd6445aa3a93ef342addcc8aadf16e490ae92697525e59099baf32abc1ecf40
 MISC metadata.xml 178 RMD160 7a7e1fa5fc747be92ff6d87c7e43c2909bf3c5d7 SHA1 6f35e3eb98d5da19aa894ba2478aabb2698037c6 SHA256 d0798c610b068ab759a9ecfa6fedaa735750e718c770783216ad5ea76e0020ba
diff --git a/app-text/highlight/highlight-2.6.12.ebuild b/app-text/highlight/highlight-2.6.12.ebuild
new file mode 100644
index 000000000000..ec63ed7e7b6a
--- /dev/null
+++ b/app-text/highlight/highlight-2.6.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.6.12.ebuild,v 1.1 2009/02/15 17:58:51 patrick 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}"/${PN}-2.6.9-gcc43.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."
+		doicon src/gui/${PN}.xpm
+		make_desktop_entry ${PN}-gui Highlight ${PN} "Utility;TextTools"
+	fi
+}