bump; rm old, rm defunct IUSE flag firebird from last prior version

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

9 files changed, 24 insertions, 283 deletions

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 8de971419aee..86ec6d3e1eab 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/sqlobject
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.58 2014/05/20 14:48:56 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.59 2015/01/02 23:00:16 idella4 Exp $
+
+*sqlobject-2.0.0 (02 Jan 2015)
+
+  02 Jan 2015; Ian Delaney <idella4@gentoo.org> +sqlobject-2.0.0.ebuild,
+  -sqlobject-1.3.1.ebuild, -sqlobject-1.3.2.ebuild, -sqlobject-1.4.0.ebuild,
+  -sqlobject-1.4.1-r1.ebuild, -sqlobject-1.4.1.ebuild, -sqlobject-1.5.0.ebuild,
+  -sqlobject-1.5.1.ebuild, sqlobject-1.6.0.ebuild:
+  bump; rm old, rm defunct IUSE flag firebird from last prior version
 
 *sqlobject-1.6.0 (20 May 2014)
 
diff --git a/dev-python/sqlobject/sqlobject-1.3.1.ebuild b/dev-python/sqlobject/sqlobject-1.3.1.ebuild
deleted file mode 100644
index 4192435e24a2..000000000000
--- a/dev-python/sqlobject/sqlobject-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.3.1.ebuild,v 1.1 2012/06/28 07:38:40 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		postgres? ( dev-python/psycopg )
-		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-1.3.2.ebuild b/dev-python/sqlobject/sqlobject-1.3.2.ebuild
deleted file mode 100644
index 6b97e4464c86..000000000000
--- a/dev-python/sqlobject/sqlobject-1.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.3.2.ebuild,v 1.1 2012/10/30 10:00:21 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		postgres? ( dev-python/psycopg )
-		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-1.4.0.ebuild b/dev-python/sqlobject/sqlobject-1.4.0.ebuild
deleted file mode 100644
index 2508db168912..000000000000
--- a/dev-python/sqlobject/sqlobject-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.4.0.ebuild,v 1.1 2013/05/22 07:22:47 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		postgres? ( dev-python/psycopg )
-		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild b/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild
deleted file mode 100644
index 6bf5fc61aadf..000000000000
--- a/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild,v 1.3 2013/10/22 14:27:48 grobian Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2[${PYTHON_USEDEP}]
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1[${PYTHON_USEDEP}] )
-		postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sqlobject/sqlobject-1.4.1.ebuild b/dev-python/sqlobject/sqlobject-1.4.1.ebuild
deleted file mode 100644
index 86c4785abef8..000000000000
--- a/dev-python/sqlobject/sqlobject-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.4.1.ebuild,v 1.1 2013/06/03 05:58:33 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		postgres? ( dev-python/psycopg )
-		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-}
diff --git a/dev-python/sqlobject/sqlobject-1.5.1.ebuild b/dev-python/sqlobject/sqlobject-1.5.1.ebuild
deleted file mode 100644
index 2ba148f87030..000000000000
--- a/dev-python/sqlobject/sqlobject-1.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.5.1.ebuild,v 1.1 2013/12/17 06:19:00 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
-
-RDEPEND=">=dev-python/formencode-0.2.2[${PYTHON_USEDEP}]
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1[${PYTHON_USEDEP}] )
-		postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sqlobject/sqlobject-1.6.0.ebuild b/dev-python/sqlobject/sqlobject-1.6.0.ebuild
index 2b36c921cd16..4ead3944c650 100644
--- a/dev-python/sqlobject/sqlobject-1.6.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.6.0.ebuild,v 1.1 2014/05/20 14:48:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.6.0.ebuild,v 1.2 2015/01/02 23:00:16 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,10 +17,9 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
+IUSE="doc mysql postgres sqlite"
 
 RDEPEND=">=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
-		firebird? ( dev-python/kinterbasdb )
 		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 		postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-python/sqlobject/sqlobject-1.5.0.ebuild b/dev-python/sqlobject/sqlobject-2.0.0.ebuild
index a77da8cda7a3..96e1887ebd50 100644
--- a/dev-python/sqlobject/sqlobject-1.5.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.5.0.ebuild,v 1.1 2013/11/26 06:43:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-2.0.0.ebuild,v 1.1 2015/01/02 23:00:16 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 inherit distutils-r1
 
@@ -17,25 +17,21 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc firebird mysql postgres sqlite"
+IUSE="doc mysql postgres sqlite"
 
-RDEPEND=">=dev-python/formencode-0.2.2[${PYTHON_USEDEP}]
-		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
-		mysql? ( >=dev-python/mysql-python-0.9.2-r1[${PYTHON_USEDEP}] )
-		postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
 python_install_all() {
 	if use doc; then
-		pushd docs
-		dodoc *.txt || die "dodoc failed"
-		dohtml -r presentation-2004-11 || die "dohtml failed"
+		HTML_DOCS=( docs/html/. )
 		insinto /usr/share/doc/${PF}
-		doins -r europython || die "doins failed"
-		popd
+		doins -r docs/europython
 	fi
+
 	distutils-r1_python_install_all
 }