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

(Portage version: 2.1.5_rc6)

4 files changed, 88 insertions, 1 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/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
+}