Version bump (bug #190702)

Package-Manager: portage-2.1.5.5

4 files changed, 73 insertions, 56 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index 9c13a2794f62..b13a20e5aa30 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.38 2008/01/25 19:33:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.39 2008/06/16 15:50:06 leonardop Exp $
+
+*asciidoc-8.2.6 (16 Jun 2008)
+
+  16 Jun 2008; Leonardo Boshell <leonardop@gentoo.org>
+  -asciidoc-7.1.2.ebuild, +asciidoc-8.2.6.ebuild:
+  Version bump. Added 'vim-syntax' flag (thanks to Vaclav Slavik for the
+  patch on bug #190702).
 
   25 Jan 2008; Fabian Groffen <grobian@gentoo.org> asciidoc-7.0.4.ebuild,
   asciidoc-7.1.2.ebuild, asciidoc-8.1.0.ebuild:
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 7cde51503c1b..67ade6d86195 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,8 +1,8 @@
 DIST asciidoc-7.0.4.tar.gz 745596 RMD160 987a181ea31110f48d73659955792b130a8870d2 SHA1 41aac17fd123909cad9e560fe5e253630e6c2f82 SHA256 ee4dfb01141f4abfea4614576f6a3274c15f1007eccf39de7495e144a69d3f8c
-DIST asciidoc-7.1.2.tar.gz 732871 RMD160 ca7d08c3b469b6c3d08f433e40100626e33739df SHA1 51e5b49474065cd5b3feeb451252f97695216fc3 SHA256 c625c143d421223b99eb5e6738c87f5f7e350d6e4b9c1ee27ac0ace478844bde
 DIST asciidoc-8.1.0.tar.gz 761244 RMD160 1f041b7dc56dd2b9c5db4b1d5ac310cce470db38 SHA1 72eccad4e71b4aad294cb6c9200fffa490e034ae SHA256 900e41bd2f8858e4cfc7e3a22ce6e46daaf6373572361b3b62443e65daf5b297
+DIST asciidoc-8.2.6.tar.gz 739790 RMD160 c07d2eaa04d16275c44756236023c0789cf54310 SHA1 cce98ed670c462a3a007b03b6f92d2108c5bc405 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc
 EBUILD asciidoc-7.0.4.ebuild 1465 RMD160 58dd8f501c14878482703d7a087b5dd2fe11817b SHA1 917dd6324f0ef6458c7fbdaeec08c4b69a482089 SHA256 7cf77b104d22dc233585ff14ba491046679f1b0550fce500138ebc6cf0fcdc74
-EBUILD asciidoc-7.1.2.ebuild 1492 RMD160 9e1950d978d7fe385c3903550ff9020fcd8a9d63 SHA1 a3da99d39579cdb6ce79179291e68f76eb63d0e7 SHA256 379fc7a5d5913f08f6670809c27e50f343d752951545914b44b9706f494c212b
 EBUILD asciidoc-8.1.0.ebuild 1521 RMD160 86c72e10ead35330ec2523f2ec032d6a72757d85 SHA1 0159ac3dbf8c53d7981d65cc6e7aca0fc7a5c8c5 SHA256 cc7c43aa971467dd9af3cb3234d2923d64fe58e723f74fc4789e8019348a6769
-MISC ChangeLog 5226 RMD160 aee821d90bfc9c09f5a3f33ec4dc30c9007128fe SHA1 423b2090d715574356f32c3f5276c4f183fc6a69 SHA256 9b56fe34f28bbd2362232e6a804f4c9aec5feb838cb7067be6205eb516971007
+EBUILD asciidoc-8.2.6.ebuild 1651 RMD160 05e5046960f47355767251952927dea49af96fc1 SHA1 da3ae8155aae90e861ed25d4703bb4cd2f3e26ab SHA256 6fa410ffac8a17d215f4b0e002927db24873f3f6d7909af269bb51eb8b829a5c
+MISC ChangeLog 5463 RMD160 5a76a6573403e1fafc7ceec192b16ab39d079b06 SHA1 95e26688f959d46c998668b017ed3b784613ed58 SHA256 b3cbc490fa91e4bfd239e97c1957a2e7162888e88a57a045750a1fb1fe64777e
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
diff --git a/app-text/asciidoc/asciidoc-7.1.2.ebuild b/app-text/asciidoc/asciidoc-7.1.2.ebuild
deleted file mode 100644
index 6da6ce0a905d..000000000000
--- a/app-text/asciidoc/asciidoc-7.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-7.1.2.ebuild,v 1.4 2008/01/25 19:33:30 grobian Exp $
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-SRC_URI="http://www.methods.co.nz/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=virtual/python-2.3
-		dev-libs/libxslt"
-
-src_install() {
-	# Main binary
-	newbin asciidoc.py asciidoc
-
-	# Conf. files
-	insinto /etc/asciidoc
-	doins *.conf
-
-	# Shared files
-	dodir /usr/share/asciidoc
-	for dir in doc docbook-xsl examples filters images stylesheets; do
-		cp -R $dir ${D}/usr/share/asciidoc
-	done
-	# note: we write some symlinks' their targets here, because we
-	# otherwise would end up with dead symlinks (bug #107530)
-	for f in {README,CHANGELOG}.txt; do
-		cp -f ${f} ${D}/usr/share/asciidoc/examples/website/${f}
-	done
-
-	# Filters
-	dodir /etc/asciidoc/filters
-	chmod 0755 ${D}/usr/share/asciidoc/filters/*.py
-	for f in code-filter.{conf,py}; do
-		dosym /usr/share/asciidoc/filters/${f} /etc/asciidoc/filters/${f}
-	done
-
-	# Stylesheets
-	insinto /etc/asciidoc/stylesheets
-	doins stylesheets/*.css
-
-	# Misc. documentation
-	dodoc BUGS CHANGELOG COPYRIGHT README
-	dodoc docbook-xsl/asciidoc-docbook-xsl.txt
-	dohtml -r doc/*
-	doman doc/asciidoc.1
-}
diff --git a/app-text/asciidoc/asciidoc-8.2.6.ebuild b/app-text/asciidoc/asciidoc-8.2.6.ebuild
new file mode 100644
index 000000000000..46f30e71ddb2
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.2.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.2.6.ebuild,v 1.1 2008/06/16 15:50:06 leonardop Exp $
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+SRC_URI="http://www.methods.co.nz/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples vim-syntax"
+
+DEPEND=">=virtual/python-2.3
+		dev-libs/libxslt"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i \
+		-e "s:^BINDIR=.*:BINDIR=${D}usr/bin:" \
+		-e "s:^MANDIR=.*:MANDIR=${D}usr/share/man:" \
+		-e "s:^CONFDIR=.*:CONFDIR=${D}etc/asciidoc:" \
+		-e "s:^VIM_CONFDIR=.*:VIM_CONFDIR=${D}usr/share/vim/vimfiles:" \
+		"${S}/install.sh"
+}
+
+src_install() {
+	dodir /usr/bin
+
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	"${S}"/install.sh
+
+	if use examples; then
+		# This is a symlink to a directory
+		rm -f examples/website/images
+		cp -Rf images examples/website
+
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	# HTML pages (with their sources)
+	dohtml -r doc/*
+	insinto /usr/share/doc/${PF}/html
+	doins doc/*.txt
+
+	# Misc. documentation
+	dodoc BUGS CHANGELOG COPYRIGHT README
+	dodoc docbook-xsl/asciidoc-docbook-xsl.txt
+}
+
+pkg_preinst() {
+	# Clean any symlinks in /etc possibly installed by previous versions
+	if [ -d "${ROOT}etc/asciidoc" ]; then
+		einfo "Cleaning old symlinks under /etc/asciidoc"
+		for entry in $(find "${ROOT}etc/asciidoc" -type l); do
+			rm -f $entry
+		done
+	fi
+}