Version bump. Fix build with >=boost-1.50.

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

3 files changed, 83 insertions, 5 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 5bc24e1f83f3..861a8fd5819d 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/highlight
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.53 2012/09/17 14:59:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.54 2012/10/06 02:45:05 radhermit Exp $
+
+*highlight-3.12 (06 Oct 2012)
+
+  06 Oct 2012; Tim Harder <radhermit@gentoo.org> +highlight-3.12.ebuild:
+  Version bump. Fix build with >=boost-1.50.
 
   17 Sep 2012; Alexis Ballier <aballier@gentoo.org> highlight-3.9.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 1f1458afd4a7..d3b6962575ff 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -2,20 +2,26 @@
 Hash: SHA256
 
 AUX highlight-3.3-parallel-make.patch 323 SHA256 5e458765f8b2109f6c6a2dc65ae9fc131c023328d6620b49af923a40a9ec7083 SHA512 027ab4ca6970ba46c4d1081c848d8736707c7932c6951cfc1b0bbcb8e7dc1f4a7b5719328ef9a3e19713408fc6090a10ea59bfc288758095647f36c3b8f6ac4e WHIRLPOOL 5fc6b6dcd46d1e1f779c6b773ee57c05902bdaeb5af55e604afd6ab03750b415d86c8d6775396abb87945fb113c7e3aa6828bb28d54ffe8adabfb75e358f1fa9
+DIST highlight-3.12.tar.bz2 679786 SHA256 32f22fc63243c48ee7499c7834af50de4ed0ec84b12bd9acfaf7649e36083000 SHA512 850f59ebab9da6f38b0e42bdcdee1dd182cac31fcb8523ef88d0600cc44b682230e365918d3b97fd06ad167fcaaf69fbc0315bc848d485bcb071ff8009b10bf5 WHIRLPOOL 8fdb8eaa64ec16cc51d41dded86f0da833b7e07d92b697c0b6580f89a1cefbb9b102fe113e1f45b1289b09ad422d41f4282e4f2b3a241e7041d409456fa81353
 DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
 DIST highlight-3.7.tar.bz2 653672 SHA256 8828930af8058723cafe04b07c5aa5cc9a36e4174f6d7c2c9403700ac00bb5bd SHA512 800d7b56520116a96c802626f10179116f6aaa94ee4d266cdd3bcfb826392c40fcda822923d3e7808180eff601668c60f50aeedbb5fb4632881a91eb40b6f467 WHIRLPOOL b36c19a32e54770166f588ec78f9f633aafe04a68b56fa0adaf7b081ee3987a25cdb22820fdb4cba0992cc60318817ec926b46455c7be0c949d6791da4f3c9b7
 DIST highlight-3.8.tar.bz2 655164 SHA256 5aac5277a94863a05cb89624002b5467bc68ad1a6ffe2d4a2c0317093b635499 SHA512 f87f080af799c1269c830e7cea36c253ad14ab7bba316b54a8ef03435f451e2cc490cd85fe700acbebd7f214e794d3ac42d91f3b97494c3b66237d4c633d1ea7 WHIRLPOOL fece4c024f386a2075bb7f134507e061c2fce0ea58672a019bc3f4b347786f5d43f7748c396be5057debe5c7ff5fe87d6985287052188230c3a2165b5f83491e
 DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
+EBUILD highlight-3.12.ebuild 1837 SHA256 67f5e95c4a9bb8314fc4505eae4b3915c4c97ce5e7616125b50091c3d1a52954 SHA512 ca55f0885b1556fdfb0736c77acd9a32f019a3a536a2f32d50ca2acd365f013b231acdb8ed49d5afd47e96df9d45507dc5ccb07542f44ead18121a95882bcafe WHIRLPOOL 53369a9899911c85be434232b6e10f3c5e4f944f10c4c1252beb28c0e63263fa92764bd604224821304c938890ba6c8eb3e13b060f70f888d9a8e7d5d0b464a2
 EBUILD highlight-3.3.ebuild 1598 SHA256 c1ae472beef56f1e0df7512672a27a17e3810e96818983450141959913b5bd60 SHA512 9ae52c16c9ed12f28f40d2ba8c9adc7385cd99be90efa99f46dedcf5eccc21ee8c78e7f3699e5c063118b79eeffb3be6302e147ae4e43931ee0de6f5791b8f60 WHIRLPOOL 408b270fe7dbe8b42c93fbcbce6a6265a960060ef39499a1a324e1beff27247bf555b4c512fae574fdb4dd425531e716369e362558ecc46c4cd89dca69719e43
 EBUILD highlight-3.7.ebuild 1713 SHA256 d09852f377f66da3f2801fd854da0e7083894a5720aad7acf42954efe6abaf97 SHA512 40147d7661440613d5cd27836bb235072cffb56b355be8ebc703674d2ab304c194a92b51a00bd5612d39ef3b751edb1ca3900611ee7cd793062971953adee777 WHIRLPOOL a61450e4613c1f31c0044215e112e312e8a5aaae0b24496faf649e72fc1d9eb87cad2d123ab343313bff7301778af8956a1f412c290644fd372e92722d997b5c
 EBUILD highlight-3.8.ebuild 1713 SHA256 1ee4c2b98764c0ffae168e957a9ffc9e4f9d2725ba52869b9f3930d6d82a05e2 SHA512 3b7c387105eb9adb67b76ca4c9146435847a107c3b0d5106cdf49c16a68918a164ca52ef96e377d44d2848581ded3f30a37fe30dda10b63bb4f4f9a65ac3e23f WHIRLPOOL b42672c490056bf21a7833eda7cb80813ce7847276aa1f2f7306e6d8b653a32fcb5d44d0599901547423693a09f1dbe5979327d28b06dee656786f26e0cb0a8b
 EBUILD highlight-3.9.ebuild 1724 SHA256 6cc677458c6d9dff4faf3783b2ea2d611134c19ecfdcfa4ef92c5da3e402bc66 SHA512 87ffcb1be1e393c2f5e858710e9d606e054974122f28f192a2a03a6bf41781fbf55bf6874de637205966c22062ad5287dd75b0e1865964f0a34a88f064c6492e WHIRLPOOL 5065b5c4bb9decaf4e33dd5b1f46bc11146779f578be966571247a3ce70229b78ee50393b1ffe7a20f9a633916a6c60bb3c1a3058afd798642e5cea40bf631ab
-MISC ChangeLog 7004 SHA256 03a5b37cbbc6d04c5fa9d115ce94932f4b74dfb25cda55a33dd5d633b54175cc SHA512 6bc416a7b5c98bf8e885d318702557fb0d89455839c6a1f925610f2e64e32ce44957e4028cbb87def9be9db6cbeb4ba2fe1763bfca9f919779c8ba607f748768 WHIRLPOOL 089dff54390a1774d7d4ac261d7eecc67a1c05202bc2523314478444e414de6ed37edb58874fdf5a1b32b24de09c6f8a7662fc226045ab53e390ed3117f23b63
+MISC ChangeLog 7155 SHA256 900461d08a14ff918aaed6d88b307bd42a106eba43fb3cd755448210d4a47724 SHA512 4e1f4bb5f36a4020d1d002dddb9001729d6458c3756724f194f70c114d25c402363eb80dadf55660363cd5a555dc4eae1683e82e52e51960ead50ef19eb95e18 WHIRLPOOL cd535f68b6b8c3a9f98251c87692af4104896eb0cd67d51aa11697d6ba553c39f87f689e6d4cce3890466397747c186aef24fe32c15e62ddc926014fd2db8607
 MISC metadata.xml 176 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81 SHA512 5701c09bfd65e52e5921c9966dc86148d6543eacd03eb1ea7369b08907c7584b896d337f238268d239831391431357d416b748e001d4d5aa0a23440a91193b13 WHIRLPOOL d39ebf5ffd0c2d0e6d535224587e95fe7dc4d14584ab83733408fbe67836dded86f8630b5fa7352b9bbbec9ae118148e9e6a0ab93f3a2ae159dda3901fad3386
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBXOtYACgkQvFcC4BYPU0pmywCaAuVdr7Qt30HswgdT19v4e+mf
-6TUAnA8/95zgx1dIjCjxYadvAQWmG6Ge
-=dtnG
+iQEcBAEBCAAGBQJQb5s/AAoJEEqz6FtPBkyjn4sIAIdT0k+b+h64Xb1o8cu7CoCK
+Q7Fo5BzgvqRx5LWVXppXIdd0FM9z9k0+/0eINolVtSPCCH1LbEHw1PqTQPAaEc1x
+ZmlcIASjJH1LM5ANS1KcauGBINjrpmECSQ+4R8gvAkr9ROOesHTiJQwxcuva9LAQ
+r5/fjIWIEGb8sE+axhFmelxlZSlxe5v+/5a4iP7Hcrwk7PHYD8gp+W6F11ZhZVfH
+xnzjTcHOKPWExBuPWxMHSWGaZriTbPtYujjS2Zv1Uo1wKDvLU6JBzILxYp7LSa0H
+PeWh8bNL/4DXpAUfLkZZyNJJNtgDfHKAfx9sb9/3Vx6OoipNqoGYdzljyZHYg2g=
+=+GmW
 -----END PGP SIGNATURE-----
diff --git a/app-text/highlight/highlight-3.12.ebuild b/app-text/highlight/highlight-3.12.ebuild
new file mode 100644
index 000000000000..7fc8e8394669
--- /dev/null
+++ b/app-text/highlight/highlight-3.12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.12.ebuild,v 1.1 2012/10/06 02:45:05 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2 flag-o-matic boost-utils
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+pkg_setup() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS} -I$(boost-utils_get_includedir)"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"LUA_CFLAGS="
+		"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+		"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+		"conf_dir=${EPREFIX}/etc/highlight/"
+	)
+}
+
+src_prepare() {
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	append-cxxflags -I$(boost-utils_get_includedir)
+}
+
+src_compile() {
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+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 "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}