Cleanup: remove older versions; bump to 8.5.1; fix dependencies (previously DEPEND and RDEPEND were swapped); remove doc USE flag, always install the HTML documentation; use /usr/share to install the data files (closes bug #274319).

(Portage version: 2.2_rc55/cvs/Linux x86_64)

7 files changed, 32 insertions, 347 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index a2304c0b6a10..562a4754802b 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.50 2009/11/06 00:05:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.51 2009/12/04 16:55:12 flameeyes Exp $
+
+*asciidoc-8.5.1 (04 Dec 2009)
+
+  04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -asciidoc-7.0.4.ebuild, -asciidoc-8.1.0.ebuild, -asciidoc-8.2.7.ebuild,
+  -asciidoc-8.4.4.ebuild, -asciidoc-8.4.5.ebuild, -asciidoc-8.5.0.ebuild,
+  +asciidoc-8.5.1.ebuild:
+  Cleanup: remove older versions; bump to 8.5.1; fix dependencies
+  (previously DEPEND and RDEPEND were swapped); remove doc USE flag, always
+  install the HTML documentation; use /usr/share to install the data files
+  (closes bug #274319).
 
 *asciidoc-8.5.0 (06 Nov 2009)
 
diff --git a/app-text/asciidoc/asciidoc-7.0.4.ebuild b/app-text/asciidoc/asciidoc-7.0.4.ebuild
deleted file mode 100644
index 21c5add3e35c..000000000000
--- a/app-text/asciidoc/asciidoc-7.0.4.ebuild
+++ /dev/null
@@ -1,51 +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.0.4.ebuild,v 1.11 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"
-
-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.1.0.ebuild b/app-text/asciidoc/asciidoc-8.1.0.ebuild
deleted file mode 100644
index 838191e44d5e..000000000000
--- a/app-text/asciidoc/asciidoc-8.1.0.ebuild
+++ /dev/null
@@ -1,58 +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-8.1.0.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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples"
-
-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:" \
-		"${S}/install.sh"
-}
-
-src_install() {
-	dodir /usr/bin
-	${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
-}
diff --git a/app-text/asciidoc/asciidoc-8.2.7.ebuild b/app-text/asciidoc/asciidoc-8.2.7.ebuild
deleted file mode 100644
index 838b8af6e3c9..000000000000
--- a/app-text/asciidoc/asciidoc-8.2.7.ebuild
+++ /dev/null
@@ -1,62 +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-8.2.7.ebuild,v 1.1 2008/10/18 14:11:49 pva 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.4
-		app-text/docbook-xsl-stylesheets
-		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 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
-}
diff --git a/app-text/asciidoc/asciidoc-8.4.4.ebuild b/app-text/asciidoc/asciidoc-8.4.4.ebuild
deleted file mode 100644
index 4e81936fe2ed..000000000000
--- a/app-text/asciidoc/asciidoc-8.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.4.4.ebuild,v 1.1 2009/05/22 22:10:56 patrick 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 doc"
-
-DEPEND=">=virtual/python-2.4
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		media-gfx/graphviz"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in
-	else
-		sed -i\
-			-e '/^vimdir/s/@sysconfdir@\/vim/\/usr\/share\/vim\/vimfiles/' \
-			-e 's/\/etc\/vim//' \
-			Makefile.in
-	fi
-
-	sed -i -e 's/fop.sh/fop/' a2x
-}
-
-src_install() {
-	dodir /usr/bin
-
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	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)
-	if use doc; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${PF}/html
-		doins doc/*.txt
-	fi
-
-	# Misc. documentation
-	dodoc BUGS CHANGELOG 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
-}
diff --git a/app-text/asciidoc/asciidoc-8.5.0.ebuild b/app-text/asciidoc/asciidoc-8.5.0.ebuild
deleted file mode 100644
index 21e0d3b34f9a..000000000000
--- a/app-text/asciidoc/asciidoc-8.5.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.5.0.ebuild,v 1.1 2009/11/06 00:05:52 patrick Exp $
-
-EAPI="2"
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-SRC_URI="mirror://sourceforge/${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 doc"
-
-DEPEND=">=virtual/python-2.4
-		~app-text/docbook-xml-dtd-4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		media-gfx/graphviz"
-RDEPEND="~app-text/docbook-xml-dtd-4.5"
-
-src_prepare(){
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in
-	else
-		sed -i\
-			-e '/^vimdir/s/@sysconfdir@\/vim/\/usr\/share\/vim\/vimfiles/' \
-			-e 's/\/etc\/vim//' \
-			Makefile.in
-	fi
-
-	sed -i -e 's/fop.sh/fop/' a2x
-}
-
-src_install() {
-	dodir /usr/bin
-
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	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)
-	if use doc; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${PF}/html
-		doins doc/*.txt
-	fi
-
-	# Misc. documentation
-	dodoc BUGS CHANGELOG 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
-}
diff --git a/app-text/asciidoc/asciidoc-8.4.5.ebuild b/app-text/asciidoc/asciidoc-8.5.1.ebuild
index 5f4ecd34affe..7262c20b5439 100644
--- a/app-text/asciidoc/asciidoc-8.4.5.ebuild
+++ b/app-text/asciidoc/asciidoc-8.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.4.5.ebuild,v 1.2 2009/06/27 08:23:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.5.1.ebuild,v 1.1 2009/12/04 16:55:12 flameeyes Exp $
 
 EAPI="2"
 
@@ -11,26 +11,29 @@ SRC_URI="mirror://sourceforge/${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 doc"
+IUSE="examples vim-syntax"
 
-DEPEND=">=virtual/python-2.4
-		~app-text/docbook-xml-dtd-4.5
-		app-text/docbook-xsl-stylesheets
+RDEPEND=">=virtual/python-2.4
+		>=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
-		media-gfx/graphviz"
-RDEPEND="~app-text/docbook-xml-dtd-4.5"
+		media-gfx/graphviz
+		app-text/docbook-xml-dtd:4.5
+		|| ( www-client/lynx www-client/w3m )"
+DEPEND=""
 
-src_prepare(){
+src_prepare() {
 	if ! use vim-syntax; then
 		sed -i -e '/^install/s/install-vim//' Makefile.in
 	else
 		sed -i\
 			-e '/^vimdir/s/@sysconfdir@\/vim/\/usr\/share\/vim\/vimfiles/' \
 			-e 's/\/etc\/vim//' \
-			Makefile.in
+			Makefile.in || die
 	fi
+}
 
-	sed -i -e 's/fop.sh/fop/' a2x
+src_configure() {
+	econf --sysconfdir=/usr/share || die
 }
 
 src_install() {
@@ -42,31 +45,16 @@ src_install() {
 
 	if use examples; then
 		# This is a symlink to a directory
-		rm -f examples/website/images
-		cp -Rf images examples/website
+		rm examples/website/images || die
 
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples || die
+		dosym /usr/share/asciidoc/images /usr/share/doc/${PF}/examples || die
 	fi
 
-	# HTML pages (with their sources)
-	if use doc; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${PF}/html
-		doins doc/*.txt
-	fi
+	dohtml doc/*.html || die
+	dosym /usr/share/asciidoc/images /usr/share/doc/${PF}/html || die
+	dosym /usr/share/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/${PF}/html || die
 
-	# Misc. documentation
-	dodoc BUGS CHANGELOG 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
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt || die
 }