app-text/asciidoc: Bring back ~hppa keyword (bug #356069), add use flag "highlight" (bug #344289)

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

5 files changed, 20 insertions, 10 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index bdd5d4ceff27..9376573485de 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.66 2011/02/22 14:15:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.67 2011/02/23 08:57:42 sping Exp $
+
+  23 Feb 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.6.4.ebuild,
+  metadata.xml:
+  Bring back ~hppa keyword (bug #356069), add use flag "highlight" (bug
+  #344289)
 
   22 Feb 2011; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.4.ebuild:
   Drop HPPA because of missing dep on media-sound/lilypond (bug #356069).
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index b87e41947277..7f7f625099f5 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -5,7 +5,7 @@ DIST asciidoc-8.6.4.tar.gz 853136 RMD160 24c160d8d23926d27bed721673497018e074cb5
 EBUILD asciidoc-8.2.6.ebuild 1637 RMD160 679248508c7be257f43cc382a012ce3c4af33a61 SHA1 2a2b77520e6891000ef964ee26d09e962729d8c0 SHA256 edbb13f2c919c85faa2b426881d8f0fe7fad7fd9b314c3dd0efe1824b646c5d6
 EBUILD asciidoc-8.5.3.ebuild 1980 RMD160 b841e624417e2354f1be06c89882d230db400c51 SHA1 7190caa363d3e8c268d6a0a5a10f7e7c0a60f798 SHA256 08066e6e53900e1df02d750b7ce8fb181a2f0fa99968ffaac984f14b3e9849b3
 EBUILD asciidoc-8.6.3.ebuild 2354 RMD160 9c251072d2ac29a482ac1c4b7bcfe5592ac84b98 SHA1 02c200445640e0f26dc98b01fb10675a0e726169 SHA256 5eda3c63ab98374fc34203a7064290b5abd92ece32545ca962ac4a3f74392aad
-EBUILD asciidoc-8.6.4.ebuild 2670 RMD160 479fcfe3a3e39cd2aecd93cc6273131ac07b4ad9 SHA1 e4977e289f0552a6377fcbd8099ee17758c7641e SHA256 0904b6c1455537b69395a5a8f17dde7cdd19f32980ab61c5821e7f360e3f465e
-EBUILD asciidoc-9999.ebuild 2677 RMD160 7ae0eedc479b6938c636dfa5f3874c3ad8502c23 SHA1 d828cde62df53900924560d8cfcd3616733af47f SHA256 5ad463a8d26005856290fa2a94d92ccea440952e16260666cae23d29d6b53d2c
-MISC ChangeLog 9419 RMD160 00093dce24b1fa94c60dbeb5cbf819f167b67cee SHA1 f2a2de858e5a4612ddf9f44571703f30837e1816 SHA256 3a73ac576f75def1ecff93b04710cd59f7920b32e92f3552ce074b3b8adee301
-MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+EBUILD asciidoc-8.6.4.ebuild 2731 RMD160 695b656bc9d8f291256086a2c65dbd40155a3ec4 SHA1 71bd0b8307f1378541a0f140fb89938499e351c1 SHA256 bab435e0b3ec8add893abd7e66b228b1494c8a31aed98feddb788298cf0e92b1
+EBUILD asciidoc-9999.ebuild 2730 RMD160 521a65a47c7cd364a28cbeae9ce439b1e05ae798 SHA1 7d0fa377859b06467774f76c013860e8159eff7b SHA256 ef41b42d76047a1c6b8bba571e855e68f189a8883aaa0f03d239a1edd97feefa
+MISC ChangeLog 9596 RMD160 d58850366d01ae6a68d58da9a80755030662f6e9 SHA1 deaf30521118cc661a175d0d06b1446df2ccecc5 SHA256 fec6bbb9ce3dc6dbc8ae5062e355dc1e326482d15228a37de67fe54475270475
+MISC metadata.xml 242 RMD160 c28ffe95bbcd5f3a3330d543ed106880a136ffbc SHA1 9d5083a77daad3bcf42191537777a849153b2d2e SHA256 32153166cf423cfa9e1baa2b469d8da28fae8d661492feaabefc4ca667e94908
diff --git a/app-text/asciidoc/asciidoc-8.6.4.ebuild b/app-text/asciidoc/asciidoc-8.6.4.ebuild
index e9ea24896171..b90a3135468e 100644
--- a/app-text/asciidoc/asciidoc-8.6.4.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.4.ebuild,v 1.2 2011/02/22 14:15:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.4.ebuild,v 1.3 2011/02/23 08:57:42 sping Exp $
 
 EAPI="3"
 
@@ -19,17 +19,18 @@ if [ "$PV" == "9999" ]; then
 	S=${WORKDIR}/hg
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples test vim-syntax"
+IUSE="examples highlight test vim-syntax"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		media-gfx/graphviz
 		app-text/docbook-xml-dtd:4.5
+		highlight? ( dev-util/source-highlight )
 "
 DEPEND="test? ( dev-util/source-highlight
 			media-sound/lilypond
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index f14e51c6800d..b945afd4ca62 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.2 2011/02/22 07:40:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.3 2011/02/23 08:57:42 sping Exp $
 
 EAPI="3"
 
@@ -24,12 +24,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples test vim-syntax"
+IUSE="examples highlight test vim-syntax"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		media-gfx/graphviz
 		app-text/docbook-xml-dtd:4.5
+		highlight? ( dev-util/source-highlight )
 "
 DEPEND="test? ( dev-util/source-highlight
 			media-sound/lilypond
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index e96086477315..9f8819921220 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sgml</herd>
+  <use>
+    <flag name="highlight">Enable source code highlighting</flag>
+  </use>
 </pkgmetadata>