Version bump (bug #300540), solves bug #316083 (failing tests) and bug #352005 (broken test with boost-1.45) as well.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

3 files changed, 68 insertions, 10 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index d74536d9c6e7..bbf0272ffdd4 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/source-highlight
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.44 2011/04/10 03:07:43 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.45 2012/05/26 07:54:45 dev-zero Exp $
+
+*source-highlight-3.1.6 (25 May 2012)
+
+  25 May 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +source-highlight-3.1.6.ebuild:
+  Version bump (bug #300540), solves bug #316083 (failing tests) and bug
+  #352005 (broken test with boost-1.45) as well.
 
   10 Apr 2011; Jonathan Callen <abcd@gentoo.org> source-highlight-3.1.ebuild:
   Add prefix support, bump EAPI to 3, add prefix keywords
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index a99a6a96a0a6..1dfbc676db7f 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX source-highlight-2.10.bash-completion 2327 RMD160 28f80aa45d11d50cc1f0a761bbcfbdff6f3a92b5 SHA1 067db4969febe63aa7ee2b295d1eb4bda0593c45 SHA256 87a6ca976ba64f746d677d2a15849431571ea316fa7954517570dd042f6497e1
 AUX source-highlight-2.8.bash-completion 2299 RMD160 47df7804b1eccfc1bbae46f2878173efc4146fff SHA1 766277ba4312f9028c5a96f1febdd890a60b2d44 SHA256 df359fe48ac41e28c72e259313ec6185b001bca35d7a799c497aa37f604d0cd7
 DIST source-highlight-2.11.1.tar.gz 1282485 RMD160 964e44a21d80ca4cce0f0d2eda697fb4423a3716 SHA1 cf35bc353c41a0a291b6c5a5c5c6498a5e810c2f SHA256 5a18c2e8d1baf3aadd7abe51d646351f99f80ce8ed8dd132128467eb925a9a47
 DIST source-highlight-2.11.tar.gz 1269619 RMD160 9e9a226d6247fd93490b100c666394694cd2a361 SHA1 0651329c519228241f939c16ea320fa9d0cd2c32 SHA256 80220644f52e5bae067c23a50cd1c111d38163e919e1b96545c9b4310bce77fd
 DIST source-highlight-2.9.tar.gz 1106407 RMD160 6611fc22dfcead5157517eb6c321aaa2be5fbe1b SHA1 641266525eccb985ced8c820a1c64ef88853cc70 SHA256 3d863eb95c8cc1743c4529bc5dcd3093b859f74af46d4d353fb6cefd206e0eea
+DIST source-highlight-3.1.6.tar.gz 1592588 RMD160 57ccd675ad1c709534e8ba5f6cfa7b09938d01ce SHA1 e82460c75ecfc5370b3a8e82f3e71f4fff747932 SHA256 b513f7f13797cf2cfb46b1d2a0d74f102a944749cba0f2d18b2f306b0e82bf28
 DIST source-highlight-3.1.tar.gz 1453050 RMD160 799dc3894f134184f7627a2e937fc53c2063a713 SHA1 3389e2f3da9c8c2986abf9b75c2cd6097394c757 SHA256 cb591bddb13c811d9ff8daa9565b74639fdb99cf71c50e2d3df6225fc34506a6
 EBUILD source-highlight-2.11.1.ebuild 927 RMD160 1db6119e6c22415e0611fefa01969493aafb5921 SHA1 4ccf1dd8cc6667406005bac2f0cec52a7a03b137 SHA256 f363fbe2f4440af8eb177f9e4139a136aa2f1570b835915e659508175810f217
 EBUILD source-highlight-2.11.ebuild 925 RMD160 50839e1d9d7c0e053ed70430aba699e014913383 SHA1 37bea41761d4316734b50c28b58c3ac3f45bca29 SHA256 ae2895e6b0040697ba541fede907b58406a31797a6b9a4d6c01408b837769ec7
 EBUILD source-highlight-2.9.ebuild 916 RMD160 0a5ffa589a87a6ac64444031bad3e03abfdef245 SHA1 e98358eb2f85d4c6f4414b7607db20a2626b4017 SHA256 494862a27c2ea98163a31b04f29317edd18849b2d9c0eedc9fde614130d6b81a
+EBUILD source-highlight-3.1.6.ebuild 1607 RMD160 3b23831b85835f5c3d45a4826d508fe44abd6b56 SHA1 89144499b845dcc58f3f44e35fabdf95923e4ceb SHA256 0b8baab15f48491e808e648450776dab4e5d5c143959e36a267bcf4ddaaebef7
 EBUILD source-highlight-3.1.ebuild 1470 RMD160 051159b3d21ad2358cc0c7ed38b63bcdbe7d9f16 SHA1 96a7f85679202146be9b359edfa1364316343d01 SHA256 d0d16728864b716764f55c2d00198cfb8ad142c2a58a36d698a0a05b1b232aa5
-MISC ChangeLog 8291 RMD160 67b871fdb9377a9eba05699711cca6efdceb7b4f SHA1 313b96ba30da5cbcc12a7ffe0f06ae822580a832 SHA256 fee15cd450b88032a9e2c306d9e2470e94dd91f127d8854e54bd49f2f646fa39
+MISC ChangeLog 8544 RMD160 f6f5aad4237fed9a5fdcffb6af96fabb84ecf0e6 SHA1 364d6d4901f836c0b062c73b06fc257e1271a9a9 SHA256 a0af344941b8b4454239c3dbfbeafacb76ca326b3f02450e759090f6f193f6b7
 MISC metadata.xml 236 RMD160 f6480b45266f014fda8b31f12ee91c2f28a35cba SHA1 0817f4eccce10f1acfcc60e51ae595d7874d7d60 SHA256 8db85d348f1fcca741457358302188e30b7b1c0524a9a55820b935d8bcac959e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m44ACgkQfXuS5UK5QB1uOQP6Ao/O25VM3PAbqgxh0zDzlzYe
-YScjxhdn+9X1twUuFiuRS6qYkgk9y2I9D3H7SkWVgJY3hFjz/owLX5raF+IjijbT
-/CvCx12T2CEXsHZ3w6dJSDWnapArCjgCesG67KbpWaeiw7mqNzR5qmduQJ9NxzlT
-xg03ERSzIUkMtwAvOFI=
-=EGi7
+iEYEARECAAYFAk/AjFEACgkQGwVqY66cHjCdEACffRA04qWu4uK2rUW75znzQfpa
+p9AAn0AGIMo9/oH+e5Af+uJlBaNcMDsx
+=3Q3Z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/source-highlight/source-highlight-3.1.6.ebuild b/dev-util/source-highlight/source-highlight-3.1.6.ebuild
new file mode 100644
index 000000000000..89b8aabadbc2
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-3.1.6.ebuild,v 1.1 2012/05/26 07:54:45 dev-zero Exp $
+
+EAPI="4"
+
+inherit bash-completion-r1 versionator
+
+DESCRIPTION="Generate highlighted source code as an (x)html document"
+HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
+SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+SLOT="0"
+IUSE="bash-completion doc static-libs"
+
+DEPEND=">=dev-libs/boost-1.49.0
+	dev-util/ctags"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
+	BOOST_VER="$(replace_all_version_separators _ $(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}"))"
+
+	sed -i \
+		-e "s|ac_boost_path_tmp/include|ac_boost_path_tmp/include/boost-${BOOST_VER}|" \
+		configure || die "sed failed"
+
+	econf \
+		--with-boost-regex="boost_regex-mt-${BOOST_VER}" \
+		--without-bash-completion \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	DOCS="AUTHORS ChangeLog CREDITS NEWS README THANKS TODO.txt"
+	default
+
+	use static-libs || rm -rf "${D}"/usr/lib*/*.la
+
+	use bash-completion && dobashcompletion completion/source-highlight
+
+	# That's not how we want it
+	rm -fr "${ED}/usr/share"/{aclocal,doc}
+	use doc &&  dohtml -A java doc/*.{html,css,java}
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
+	default
+}