Version bump and remove old.

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

3 files changed, 36 insertions, 37 deletions

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 57fbbf6e304e..f9edc50902ae 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/highlight
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.35 2011/02/09 11:48:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.36 2011/06/01 23:54:36 radhermit Exp $
+
+*highlight-3.4 (01 Jun 2011)
+
+  01 Jun 2011; Tim Harder <radhermit@gentoo.org> -highlight-3.0_beta.ebuild,
+  +highlight-3.4.ebuild:
+  Version bump and remove old.
 
   09 Feb 2011; Tim Harder <radhermit@gentoo.org> highlight-3.3.ebuild:
   Add dev-libs/boost to DEPEND.
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index f54b27fd6a41..26a0cad30dcb 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -3,21 +3,21 @@ Hash: SHA1
 
 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
+DIST highlight-3.4.tar.bz2 755597 RMD160 55e6b808e08eb3c160ded9b04f1e16d0e477240e SHA1 c17ab1dfb052fee807c3d48c7577b5d8fc1b5593 SHA256 6c3159465e8973917e0a7cbb964c27c2dc91db8b4ad49a0ae7034aa04c66fa9e
 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
 EBUILD highlight-3.3.ebuild 1433 RMD160 e84c7184ea16632ed0cdbc017ececf219eba0423 SHA1 513304ea2177c0d3ab043a99f0b45c53ca8f5377 SHA256 70bdf84afc4ef42963ce8c6dc1a092d1d7aec036aa3ecfb4b31ce32c73b04cf0
-MISC ChangeLog 4685 RMD160 8f09ccf451c5849b9f153bf6befc0c008a0ce6ec SHA1 d44eebe636513ed7a3269060f0d385d050e6523d SHA256 805059d251d2a919c044a18c3cd9eb22f2d027d4f998dfc0d9402e97c04f6214
+EBUILD highlight-3.4.ebuild 1378 RMD160 692c7f0656b2b18b64589c924743ad23a6ce68d8 SHA1 eab85ea91a111f5a18b26e84778423a5b5b85622 SHA256 b1f82d19e7dd98d6c3b0f9b5c4fd0713cdf1c3ef047facb8d6ab2d68085bb591
+MISC ChangeLog 4849 RMD160 ad4930bb46e02c11fcf74115441c9c260beb42f3 SHA1 c77e8b3ae9bf7e56745e052f61779484ce049e14 SHA256 75ec5019118c8eca4a35de8f8b67ca917f13e1e98907db92bbfebc5040a824cc
 MISC metadata.xml 176 RMD160 4c10f88bb3b4c3c8f85b05a0bbef8238212ae884 SHA1 239dc089587796161139a7a9928cee878b99c147 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNUn8rAAoJEEqz6FtPBkyjsDoH/3w8VR+fR3I1HCBd7Sw4XoLY
-cBPiDfaGxOreRcGfnBxnkbiEkSuFQQJXTm6+h+W4ZSRsTScyYlpo7mhfRvLa0XDW
-A8Ye3KcZpYv2RxlEcyY2QM4AgZs+2PVpFklHCkWELwZNWoAwoWgzoIK7rDBTocE4
-zDuCcMXbLuE94s6WxSZou1lE6MRuXiM/Rd7AxCGAFEAujYimYZ8z7iT2fTlxEi/U
-IGqwV2zVeINd0ajxojRNuUIGUJYuuxq7v0CK0rN/TeGSA+x09Dz0h+Hun+ql9rpZ
-U3aGZ+XeyybT4v2psazjzENwMg2IOsA0ixJAasazcYpJqI+sHw1/o/F2+hl9GR0=
-=VLE7
+iQEcBAEBAgAGBQJN5tFHAAoJEEqz6FtPBkyjAJgH/jGgta3k2Ro2DZ9ucYFfjhQz
+EneaKgukZTJeja/jNh91r7u/BSoIRE6Eu169QgPhBxuNYvqBi/Gu4/hn3PTnJ0lc
+rsy4mNdH+AyDfpMJ8UQ9UM8EcYQe2uhzyQoDnYm8+1kUCuta3LNQwpIEWk22N/PL
+BBXlJTERtAt5/6GaohjKC5bTB0iUQtFT6yHHBJ2Xqe6yBWIItp3/sm9HBiDP1v5e
+ZKJpkicQUBp9CtE9NaOzIw64jhZ+BLMZAm1FXkdGSz+JrsyIBa7kIcxszxulA7aA
+SL0N++PbrjPwNxXDLzKcC+cIh/ye7a/S65JTySNjmg8m/ZAoBThmcLzhGIbmxDk=
+=1tx8
 -----END PGP SIGNATURE-----
diff --git a/app-text/highlight/highlight-3.0_beta.ebuild b/app-text/highlight/highlight-3.4.ebuild
index 02e29194fba7..2341dc9dd132 100644
--- a/app-text/highlight/highlight-3.0_beta.ebuild
+++ b/app-text/highlight/highlight-3.4.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0_beta.ebuild,v 1.1 2010/06/19 08:16:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.1 2011/06/01 23:54:36 radhermit Exp $
 
-EAPI=3
-inherit toolchain-funcs
+EAPI=4
 
-MY_P=${P/_/-}
+inherit toolchain-funcs
 
 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/${MY_P}.tar.bz2"
+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="qt4"
+IUSE="examples qt4"
 
 DEPEND="dev-lang/lua
+	dev-libs/boost
 	qt4? ( x11-libs/qt-gui:4 )"
-
-S=${WORKDIR}/${MY_P}
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	myhlopts=(
@@ -28,36 +27,30 @@ pkg_setup() {
 		"PREFIX=${EPREFIX}/usr"
 		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
 		"conf_dir=${EPREFIX}/etc/highlight/"
-		)
+	)
 }
 
 src_prepare() {
-	sed -i \
-		-e 's:dir}plugins:dir}web_plugins:' \
-		makefile || die
-
-	sed -i \
-		-e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
 		src/core/datadir.cpp || die
 
-	sed -i \
-		-e 's:-O2::' \
+	sed -i -e 's:-O2::' \
 		-e 's:CFLAGS:CXXFLAGS:g' \
 		src/makefile || die
 }
 
 src_compile() {
-	emake -f makefile "${myhlopts[@]}" || die
-
-	if use qt4; then
-		emake -j1 -f makefile "${myhlopts[@]}" gui || die
-	fi
+	emake -f makefile "${myhlopts[@]}"
+	use qt4 && emake -f makefile "${myhlopts[@]}" gui
 }
 
 src_install() {
-	emake -f makefile "${myhlopts[@]}" install || die
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
 
-	if use qt4; then
-		emake -f makefile "${myhlopts[@]}" install-gui || die
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/examples
 	fi
 }