Version bump with GCC 4.3 and -Wl,--as-needed patch by Peter Alfredsen. There was a bug, but bugzilla is down..

Package-Manager: portage-2.1.5_rc6

5 files changed, 93 insertions, 2 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 3a9107f9d97d..e1728dc47a2c 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2008/04/16 16:18:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.16 2008/05/04 20:34:41 drac Exp $
+
+*highlight-2.6.9 (04 May 2008)
+
+  04 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/highlight-2.6.9-asneeded.patch, +files/highlight-2.6.9-gcc43.patch,
+  +highlight-2.6.9.ebuild:
+  Version bump with GCC 4.3 and -Wl,--as-needed patch by Peter Alfredsen.
 
   16 Apr 2008; Jeroen Roovers <jer@gentoo.org> highlight-2.4.8.ebuild:
   Marked ~hppa too.
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 64d8130a7834..bc1ea335aa7e 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,8 @@
+AUX highlight-2.6.9-asneeded.patch 946 RMD160 f45810d93d5c7365e055fe5735c3f76d7a1616a3 SHA1 11048d411034566477b64a9c3e283ac263874cf3 SHA256 a4ef2fd6e4429e1e9a492b20fdebae50252074cc0cee53e7278eee60bf08cf49
+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.9.tar.bz2 396590 RMD160 9d8b93183789e5571a168f486fbc0076043fe0ad SHA1 fb1ee2e404d63a3ec362ead50b20f0912aa7b48f SHA256 376376c19258c156d1f64ee9388283a050e894b55404725616739b7492159708
 EBUILD highlight-2.4.8.ebuild 631 RMD160 792d257c3ed3047503f02ade7a2013a9b53bb65b SHA1 740822d82accd35a4bd6abd7819d3a9cb0c9749f SHA256 2f688871c4957fcb230cd5d4129f5d456ba1f0539a1f6b98fb67b8b11fd288d1
-MISC ChangeLog 1879 RMD160 9138a933db1a56ce2eb2a75ecd7aba2e09f7f11c SHA1 3c4af8af2ff24effc6745ca9f6772a9adf815f67 SHA256 f752b6474cfb20ff98fd7e5c4c0acc14e9b9d768db805aed7e972b555258858a
+EBUILD highlight-2.6.9.ebuild 1250 RMD160 7ffeb0c3d73df6e70cfca0bc35a4cde330a6094d SHA1 386644ee309b6cb9a29129924d91f375e3453d33 SHA256 287648edc5f0c824fad14361e3d573cfe882db177f5cba5bc9535d73a1fed137
+MISC ChangeLog 2140 RMD160 2f3192bce57c243ac0778098b6854bfc280206ca SHA1 7e37b7d52ea361c29a33c8f7be89b983a6822b16 SHA256 a33390ba9e18dbf20ac93f05b63ca128dffd3abe62ba896906c73eaa021ec96a
 MISC metadata.xml 178 RMD160 7a7e1fa5fc747be92ff6d87c7e43c2909bf3c5d7 SHA1 6f35e3eb98d5da19aa894ba2478aabb2698037c6 SHA256 d0798c610b068ab759a9ecfa6fedaa735750e718c770783216ad5ea76e0020ba
diff --git a/app-text/highlight/files/highlight-2.6.9-asneeded.patch b/app-text/highlight/files/highlight-2.6.9-asneeded.patch
new file mode 100644
index 000000000000..09114c6217f5
--- /dev/null
+++ b/app-text/highlight/files/highlight-2.6.9-asneeded.patch
@@ -0,0 +1,17 @@
+diff -ur highlight-2.6.9.orig/src/makefile highlight-2.6.9/src/makefile
+--- highlight-2.6.9.orig/src/makefile	2008-03-26 23:19:37.000000000 +0200
++++ highlight-2.6.9/src/makefile	2008-05-04 23:26:13.000000000 +0300
+@@ -49,11 +49,11 @@
+ 	ifeq ($(WX29),true)
+ 		WX_FLAGS=`wx-config --cxxflags` -I.
+ 		OBJECTFILES:=${OBJECTFILES} gui_wx29.o gui_failure_dlg.o gui_showfile_dlg.o
+-		CXX_LINK=${CXX} ${LDFLAGS} `wx-config --libs core,base,html,adv` -o highlight-gui ${OBJECTFILES}
++		CXX_LINK=${CXX} ${LDFLAGS} ${OBJECTFILES} `wx-config --libs core,base,html,adv` -o highlight-gui
+ 	else
+ 		WX_FLAGS=`wx-config --cxxflags` -I.
+ 		OBJECTFILES:=${OBJECTFILES} gui.o gui_failure_dlg.o gui_showfile_dlg.o
+-		CXX_LINK=${CXX} ${LDFLAGS} `wx-config --libs core,base,html,adv` -o highlight-gui ${OBJECTFILES}
++		CXX_LINK=${CXX} ${LDFLAGS} ${OBJECTFILES} `wx-config --libs core,base,html,adv` -o highlight-gui
+ 	endif
+ else
+ 	OBJECTFILES:=${OBJECTFILES} main.o
diff --git a/app-text/highlight/files/highlight-2.6.9-gcc43.patch b/app-text/highlight/files/highlight-2.6.9-gcc43.patch
new file mode 100644
index 000000000000..06f46f9b2fea
--- /dev/null
+++ b/app-text/highlight/files/highlight-2.6.9-gcc43.patch
@@ -0,0 +1,15 @@
+diff -NrU5 highlight-2.6.9.old/src/gui/gui.cpp highlight-2.6.9/src/gui/gui.cpp
+--- highlight-2.6.9.old/src/gui/gui.cpp	2008-03-27 01:25:28.000000000 +0100
++++ highlight-2.6.9/src/gui/gui.cpp	2008-05-04 21:19:16.000000000 +0200
+@@ -20,10 +20,11 @@
+ #include <wx/stdpaths.h>

+ #include <wx/filefn.h>

+ #include <wx/ffile.h>

+ #include <wx/fileconf.h>

+ #include <wx/clipbrd.h>

++#include <memory>

+ 

+ #include "gui_failure_dlg.h"

+ #include "gui_showfile_dlg.h"

+ #include "highlight.xpm"

+ 

diff --git a/app-text/highlight/highlight-2.6.9.ebuild b/app-text/highlight/highlight-2.6.9.ebuild
new file mode 100644
index 000000000000..033856fdcdaf
--- /dev/null
+++ b/app-text/highlight/highlight-2.6.9.ebuild
@@ -0,0 +1,48 @@
+# 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.1 2008/05/04 20:34:41 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 highlighting."
+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::" \
+		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
+}