Marking 6.0.3-r1 stable (x86). New release: 7.0.1 (bug #96102). Removing obsolete ebuild.

(Portage version: 2.0.51.22-r1)

7 files changed, 62 insertions, 48 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index 0f928199aa5a..4184c2e57fc3 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.5 2005/06/24 21:02:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.6 2005/07/01 23:32:44 leonardop Exp $
+
+*asciidoc-7.0.1 (01 Jul 2005)
+
+  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> asciidoc-7.0.1.ebuild:
+  New release, resolves bug #96102. Patch no longer necessary. Modified
+  src_install() to follow upstream packager notes more closely.
+
+  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  asciidoc-6.0.3-r1.ebuild:
+  Stable on x86.
 
   24 Jun 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-6.0.3-r1.ebuild:
   marked ~ia64 as a mercurial dep
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 1a5a6fddefba..b89604365043 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2445d31d4b368def84551c8bdd5ec9dc asciidoc-6.0.3.ebuild 798
-MD5 2ca9b7748bd24564fa1434f1a95c3f7a asciidoc-6.0.3-r1.ebuild 904
-MD5 dba8e78dcd82d72f0912c4460e457f45 ChangeLog 913
+MD5 7088cc4f8c55f072b9b5415b4a438d17 ChangeLog 1160
+MD5 2ca9b7748bd24564fa1434f1a95c3f7a asciidoc-7.0.1.ebuild 904
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 11e17afbd1c78d0f33a7e84c885df6c1 asciidoc-6.0.3-r1.ebuild 903
+MD5 c14add69414e6d58221327d5faec0b12 files/digest-asciidoc-7.0.1 66
 MD5 b65a7aaa9b99dbad57cf64f07b2d78c8 files/asciidoc-name.patch 598
-MD5 1dd11281d3bc3afe093491c11675f973 files/digest-asciidoc-6.0.3 66
 MD5 1dd11281d3bc3afe093491c11675f973 files/digest-asciidoc-6.0.3-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCvHUQBXaUFmZvwyMRAlB9AJ9hCwk8yh4Na2Gz95dS5h4UgiTZtgCfTDYk
-+pCgFJyHVLvFjSFdkzMskys=
-=3mP+
------END PGP SIGNATURE-----
diff --git a/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild b/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild
index 0b1a9f3287ab..5a1d1fae1650 100644
--- a/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild,v 1.3 2005/06/24 21:02:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild,v 1.4 2005/07/01 23:32:44 leonardop Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.methods.co.nz/asciidoc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/python"
diff --git a/app-text/asciidoc/asciidoc-6.0.3.ebuild b/app-text/asciidoc/asciidoc-6.0.3.ebuild
deleted file mode 100644
index b4af37a18b5e..000000000000
--- a/app-text/asciidoc/asciidoc-6.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-6.0.3.ebuild,v 1.5 2005/06/13 16:48:47 ferdy Exp $
-
-DESCRIPTION="AsciiDoc is 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/asciidoc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/python"
-
-src_install() {
-
-	newbin asciidoc.py asciidoc
-
-	insopts -m664
-	insinto /etc/${PN}
-	doins *.conf
-	doins -r filters
-
-	dodoc BUGS CHANGELOG COPYRIGHT README
-	dodir /usr/share/doc/${PF}/examples
-	cp -r ${S}/examples ${D}/usr/share/doc/${PF}
-	doman ${S}/doc/asciidoc.1
-}
diff --git a/app-text/asciidoc/asciidoc-7.0.1.ebuild b/app-text/asciidoc/asciidoc-7.0.1.ebuild
new file mode 100644
index 000000000000..1d12c0cb289f
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-7.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-7.0.1.ebuild,v 1.1 2005/07/01 23:32:44 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/asciidoc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/python-2.3"
+
+src_install() {
+	# Main binary
+	newbin asciidoc.py asciidoc
+
+	# Conf. files
+	insopts -m664
+	insinto /etc/asciidoc
+	doins *.conf
+
+	# Filters
+	insinto /etc/asciidoc/filters
+	doins filters/code-filter.conf filters/code-filter.py
+	dodoc filters/*.txt
+
+	# Stylesheets
+	insinto /etc/asciidoc/stylesheets
+	doins stylesheets/*.css
+
+	# Shared files
+	dodir /usr/share/asciidoc
+	for dir in doc examples images stylesheets; do
+		cp -R $dir ${D}/usr/share/asciidoc
+	done
+
+	# Misc. documentation
+	dodoc BUGS CHANGELOG COPYRIGHT README
+	dohtml -r doc/*
+	doman doc/asciidoc.1
+}
diff --git a/app-text/asciidoc/files/digest-asciidoc-6.0.3 b/app-text/asciidoc/files/digest-asciidoc-6.0.3
deleted file mode 100644
index 1ff755657a3f..000000000000
--- a/app-text/asciidoc/files/digest-asciidoc-6.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b8d918f68a24c1d13be6999248788f8 asciidoc-6.0.3.tar.gz 774893
diff --git a/app-text/asciidoc/files/digest-asciidoc-7.0.1 b/app-text/asciidoc/files/digest-asciidoc-7.0.1
new file mode 100644
index 000000000000..291e055c1dbd
--- /dev/null
+++ b/app-text/asciidoc/files/digest-asciidoc-7.0.1
@@ -0,0 +1 @@
+MD5 b117387a6f6293c8a78fb0459564d060 asciidoc-7.0.1.tar.gz 722488