Version bump (bug #190702)

(Portage version: 2.1.5.5)

3 files changed, 70 insertions, 53 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/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
+}