Version bump for bug #337531. Bump to EAPI 4, add examples USE flag, explicitly set RDEPEND="${DEPEND}", and fix parallel make issue.

Package-Manager: portage-2.2.0_alpha22/cvs/Linux x86_64

4 files changed, 81 insertions, 3 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 85affc24d26f..059d51851a3e 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/highlight
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.33 2010/06/19 08:16:01 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.34 2011/02/09 08:52:35 radhermit Exp $
+
+*highlight-3.3 (09 Feb 2011)
+
+  09 Feb 2011; Tim Harder <radhermit@gentoo.org> +highlight-3.3.ebuild,
+  +files/highlight-3.3-parallel-make.patch:
+  Version bump for bug #337531. Bump to EAPI 4, add examples USE flag,
+  explicitly set RDEPEND="${DEPEND}", and fix parallel make issue.
 
 *highlight-3.0_beta (19 Jun 2010)
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 3a4944cbf16e..82f1119119b7 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,6 +1,9 @@
+AUX highlight-3.3-parallel-make.patch 323 RMD160 11e7ee06006121caa1ba1d05b264970259c3672a SHA1 0221be01a7e6ff1a8b50c0f71bf8aa148eecf3e6 SHA256 5e458765f8b2109f6c6a2dc65ae9fc131c023328d6620b49af923a40a9ec7083
 DIST highlight-2.9.tar.bz2 378746 RMD160 b058772aaeb2cc844cb0ae620c2866d02884b59b SHA1 6ab40a5af8b5564d90e8eba1c58b03486e8e4471 SHA256 520549886428c00af97667c4587a13aaf99cc8a5a69f8e850ab4c52940dae41d
 DIST highlight-3.0-beta.tar.bz2 553995 RMD160 1a992c77877d5c4a88fa32299ffb27c7ee7caa30 SHA1 b0bcd7d6f40abfb03ff49d3d3c1e9f393b1688d3 SHA256 5ee6cbfb519a71ed7207af524c3fcf08906352dfe6620804e64b2dd2ba999043
+DIST highlight-3.3.tar.bz2 740651 RMD160 9a020443e70c0c19215a3bfa14ea78493df98a24 SHA1 338fdecc1b30002a8d6624ace76fe2daba05ced4 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87
 EBUILD highlight-2.9.ebuild 1508 RMD160 d8f7e81f289eb41d232c2178a27ef999420a12ab SHA1 7a65727050fed262ab9b4ac623ed42d6e6b0a0cf SHA256 88a00e3c60f37f25e13f81c6c507c2015851c3fc77cf518806c039be3d931b37
 EBUILD highlight-3.0_beta.ebuild 1387 RMD160 672391bcb74732c4a6639da668599abbdee94bab SHA1 d5536e82aba348b8a9bd8eeccdfcf52b6d3fa276 SHA256 682c3e49b526ee439c93eb62e9760f248ec5cdd020b1e10c1b6c310702d13bf9
-MISC ChangeLog 4296 RMD160 29a55ae414d122bb1b54ab54bbd3566bcdc8a051 SHA1 3e646dffc6d849dac1cffa4431190d43e99c007e SHA256 f58d757cbe7c1b45f7598ce6c3a134b579a3dea7485717676a75aadd489ac34b
+EBUILD highlight-3.3.ebuild 1417 RMD160 03cf6f7227f5892fff2ab8dcc9b2a39ed5ecc1e0 SHA1 444fd8e001afa074986a936a1fd83dce67df37cb SHA256 1de22ddb51fce47884c5d1338cebb7b45180f4ecb3f0123945693903715f348a
+MISC ChangeLog 4581 RMD160 df0fee1697ca5725a801d476bda3ffdd49594782 SHA1 7fcf1250236dc50bfadcd18fae9d6af8a1dae7ef SHA256 bc933a1b87783bc9704f3fd1036a930040f1cdaf89ae0063edbac971edbb8832
 MISC metadata.xml 176 RMD160 4c10f88bb3b4c3c8f85b05a0bbef8238212ae884 SHA1 239dc089587796161139a7a9928cee878b99c147 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81
diff --git a/app-text/highlight/files/highlight-3.3-parallel-make.patch b/app-text/highlight/files/highlight-3.3-parallel-make.patch
new file mode 100644
index 000000000000..9d56c5e60eb5
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.3-parallel-make.patch
@@ -0,0 +1,11 @@
+--- highlight-3.3/src/makefile.orig
++++ highlight-3.3/src/makefile
+@@ -103,7 +103,7 @@
+ highlight-gui: libhighlight.a ${GUI_OBJECTS}
+ 	cd gui-qt && \
+ 	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\"' && \
+-	make
++	$(MAKE)
+ 
+ $(OBJECTFILES) : makefile
+ 
diff --git a/app-text/highlight/highlight-3.3.ebuild b/app-text/highlight/highlight-3.3.ebuild
new file mode 100644
index 000000000000..8843bffd7f15
--- /dev/null
+++ b/app-text/highlight/highlight-3.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.1 2011/02/09 08:52:36 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+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-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+DEPEND="dev-lang/lua
+	qt4? ( x11-libs/qt-gui:4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+		"conf_dir=${EPREFIX}/etc/highlight/"
+	)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	sed -i -e 's:-O2::' \
+		-e 's:CFLAGS:CXXFLAGS:g' \
+		src/makefile || die
+}
+
+src_compile() {
+	emake -f makefile "${myhlopts[@]}"
+	use qt4 && emake -f makefile "${myhlopts[@]}" gui
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/examples
+	fi
+}