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).

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

8 files changed, 45 insertions, 360 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/Manifest b/app-text/asciidoc/Manifest
index 65cdec359878..61a5acc74d1b 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,16 +1,16 @@
-DIST asciidoc-7.0.4.tar.gz 745596 RMD160 987a181ea31110f48d73659955792b130a8870d2 SHA1 41aac17fd123909cad9e560fe5e253630e6c2f82 SHA256 ee4dfb01141f4abfea4614576f6a3274c15f1007eccf39de7495e144a69d3f8c
-DIST asciidoc-8.1.0.tar.gz 761244 RMD160 1f041b7dc56dd2b9c5db4b1d5ac310cce470db38 SHA1 72eccad4e71b4aad294cb6c9200fffa490e034ae SHA256 900e41bd2f8858e4cfc7e3a22ce6e46daaf6373572361b3b62443e65daf5b297
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST asciidoc-8.2.6.tar.gz 739790 RMD160 c07d2eaa04d16275c44756236023c0789cf54310 SHA1 cce98ed670c462a3a007b03b6f92d2108c5bc405 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc
-DIST asciidoc-8.2.7.tar.gz 843238 RMD160 d9b19b5bd90a7ee26b3d63ba8b5f6ce60841e62c SHA1 ec784654f01f3aa71af6453c8985839010759fab SHA256 da021d8f32e1bcacfd11b5bb12bd9a9cd9ec9532ad1a54bcd53fed211fe71af6
-DIST asciidoc-8.4.4.tar.gz 1160222 RMD160 96eb1569db0fa8c2e78cc713ee72a0c25646d3be SHA1 0306d1a41eb1060873ba4fa655112aeaa64001d1 SHA256 43181d4753376fe22d8a7949a94b5ebb439fd94a7b92791e9126e82632adfa62
-DIST asciidoc-8.4.5.tar.gz 1189280 RMD160 4e210df26962c1154cc131e3549b92762eefc8f7 SHA1 b1a8488f0c217a00084fa5f9f36cecc522e79b34 SHA256 e7e4df8fd984520ee692bb639679d51f5be279ef96dc23efd229e2bc100152db
-DIST asciidoc-8.5.0.tar.gz 1229187 RMD160 82ed69c2adaf60cbcafcbd1df5bc5445704c2335 SHA1 bfdc746340780884a90145ef78528ca4a71e3a02 SHA256 a21fe32360e629cd9e7b443e0893ca0dd12978212a9e9ae1e6d3055b169c5bc9
-EBUILD asciidoc-7.0.4.ebuild 1465 RMD160 58dd8f501c14878482703d7a087b5dd2fe11817b SHA1 917dd6324f0ef6458c7fbdaeec08c4b69a482089 SHA256 7cf77b104d22dc233585ff14ba491046679f1b0550fce500138ebc6cf0fcdc74
-EBUILD asciidoc-8.1.0.ebuild 1521 RMD160 86c72e10ead35330ec2523f2ec032d6a72757d85 SHA1 0159ac3dbf8c53d7981d65cc6e7aca0fc7a5c8c5 SHA256 cc7c43aa971467dd9af3cb3234d2923d64fe58e723f74fc4789e8019348a6769
+DIST asciidoc-8.5.1.tar.gz 1242674 RMD160 cc24f6befc53b493e18f2dc186b4849302c176b3 SHA1 e8c043d9a10ada9c38cb6725e5c00895f474ae5a SHA256 ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20
 EBUILD asciidoc-8.2.6.ebuild 1637 RMD160 679248508c7be257f43cc382a012ce3c4af33a61 SHA1 2a2b77520e6891000ef964ee26d09e962729d8c0 SHA256 edbb13f2c919c85faa2b426881d8f0fe7fad7fd9b314c3dd0efe1824b646c5d6
-EBUILD asciidoc-8.2.7.ebuild 1666 RMD160 1a252473b28db491c5b7a69bf704fa6e307fb6db SHA1 35697c84ab2f1283976eea56c761a2eb5b4930fd SHA256 22817093206376da8f2674f2f6a7a68ea58cf31424afa0b4ab8d1ff6357ae795
-EBUILD asciidoc-8.4.4.ebuild 1773 RMD160 d7e84080a66a72fb8a4124b8663fefbecc93f04a SHA1 bdfd62af0bb919fb3c57d4dca10d2ae830a28a07 SHA256 4160652ad4cecd2067ce122a76c44fcf6b3e9c0eed0a863514dfa4e0b4ed08c4
-EBUILD asciidoc-8.4.5.ebuild 1826 RMD160 727bb55f5655007e708cd474cce121f48427f548 SHA1 39d5fc7601d308c04095c14087c6c7e9a0dc9494 SHA256 a43e54fa90a9cb112661cbfb4c60079f39e09c331bbc261a49723df552744411
-EBUILD asciidoc-8.5.0.ebuild 1826 RMD160 3e0d4135ad5083457fc244f34a40f68bd40a8a5c SHA1 53bba65eacf8a333782e28a2ae26b8766055f225 SHA256 0ccd5777938f84a8cd96889c72c223af23703a9bede27500ef6c82edc801800d
-MISC ChangeLog 6892 RMD160 b39ce3fed9194b71981f0a6e94931b3fdbaf6d0d SHA1 89a8d714a7ad50f9cc5beeb66dfb0ca33d5338b0 SHA256 71bc83b9445995f7373e9f2c1422c10440a2aad8aa24621416008cc321401f02
+EBUILD asciidoc-8.5.1.ebuild 1691 RMD160 2c55577af1ec1ec6339fcb3e55e38e6e91d128b8 SHA1 9f0239721a572c0c07e00e97fc6b5d7697b02e48 SHA256 ce41abc59eaab607bdf12c7ba3ee7faf7db7a6290fdf97844ddf31506fa6068a
+MISC ChangeLog 7397 RMD160 510aba31f01d0dace30edb704f25aed4136fe56d SHA1 ed71255067ea5c61398c8abf4cfca00d58034777 SHA256 37a09a47857831029516c6894533344c68b6e09768986bc453fdd4ee03fa2170
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksZPusACgkQAiZjviIA2Xh4ygCcCSaH6HvGhgz2MmxzJSf5/tJP
+ly8AoLAHi/di9zm7d8f3XajF/VwKyrKD
+=jkwe
+-----END PGP SIGNATURE-----
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
 }