Version bump fixes bug 383183 and removed testing versions.

(Portage version: 2.1.10.11/cvs/Linux i686)

5 files changed, 14 insertions, 161 deletions

diff --git a/dev-db/postgresql-docs/ChangeLog b/dev-db/postgresql-docs/ChangeLog
index ced397d4c5c6..136af11da376 100644
--- a/dev-db/postgresql-docs/ChangeLog
+++ b/dev-db/postgresql-docs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/postgresql-docs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.106 2011/08/28 15:21:17 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.107 2011/09/17 17:46:25 titanofold Exp $
+
+*postgresql-docs-9.1.0 (17 Sep 2011)
+
+  17 Sep 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgresql-docs-9.1_beta1.ebuild, -postgresql-docs-9.1_beta2.ebuild,
+  -postgresql-docs-9.1_beta3.ebuild, -postgresql-docs-9.1_rc1.ebuild,
+  +postgresql-docs-9.1.0.ebuild:
+  Version bump fixes bug 383183 and removed testing versions.
 
 *postgresql-docs-9.1_rc1 (28 Aug 2011)
 
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1_rc1.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild
index cfc7d7a56802..67ea26118896 100644
--- a/dev-db/postgresql-docs/postgresql-docs-9.1_rc1.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1_rc1.ebuild,v 1.1 2011/08/28 15:21:17 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild,v 1.1 2011/09/17 17:46:25 titanofold Exp $
 
 EAPI="4"
 
@@ -8,17 +8,14 @@ inherit versionator
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
-# Upstream doesn't have an underscore in the file name
-MY_PV=${PV/_/}
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
 
 DESCRIPTION="PostgreSQL documentation"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 
-S=${WORKDIR}/postgresql-${MY_PV}
-SLOT="$(get_version_component_range 1-2)"
-
 IUSE=""
 
 DEPEND=""
@@ -35,6 +32,7 @@ src_install() {
 
 	docinto sgml
 	dodoc src/sgml/*.{sgml,dsl}
+
 	docinto sgml/ref
 	dodoc src/sgml/ref/*.sgml
 
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1_beta1.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1_beta1.ebuild
deleted file mode 100644
index 1e9c7a53d057..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-9.1_beta1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1_beta1.ebuild,v 1.1 2011/05/03 00:12:07 titanofold Exp $
-
-EAPI="4"
-
-inherit versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-# Upstream doesn't have an underscore in the file name
-MY_PV=${PV/_/}
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-
-S=${WORKDIR}/postgresql-${MY_PV}
-SLOT="$(get_version_component_range 1-2)"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-
-	cd "${S}/doc"
-
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-
-	docinto html
-	dodoc src/sgml/html/*.html
-	dodoc src/sgml/html/stylesheet.css
-
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1_beta2.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1_beta2.ebuild
deleted file mode 100644
index 2a405fe9db97..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-9.1_beta2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1_beta2.ebuild,v 1.1 2011/06/26 14:45:34 titanofold Exp $
-
-EAPI="4"
-
-inherit versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-# Upstream doesn't have an underscore in the file name
-MY_PV=${PV/_/}
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-
-S=${WORKDIR}/postgresql-${MY_PV}
-SLOT="$(get_version_component_range 1-2)"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-
-	cd "${S}/doc"
-
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-
-	docinto html
-	dodoc src/sgml/html/*.html
-	dodoc src/sgml/html/stylesheet.css
-
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1_beta3.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1_beta3.ebuild
deleted file mode 100644
index cb38f309be55..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-9.1_beta3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1_beta3.ebuild,v 1.1 2011/07/15 12:11:00 titanofold Exp $
-
-EAPI="4"
-
-inherit versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-# Upstream doesn't have an underscore in the file name
-MY_PV=${PV/_/}
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-
-S=${WORKDIR}/postgresql-${MY_PV}
-SLOT="$(get_version_component_range 1-2)"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-
-	cd "${S}/doc"
-
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-
-	docinto html
-	dodoc src/sgml/html/*.html
-	dodoc src/sgml/html/stylesheet.css
-
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}