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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

10 files changed, 32 insertions, 302 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/Manifest b/dev-python/sqlobject/Manifest
index ff0bcc830062..a2820410906a 100644
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST SQLObject-1.3.1.tar.gz 261767 SHA256 a3a33eb6fb2c683c8a379f5a51a45505b8c4b2153b61114a4708f868366abcb3 SHA512 fd98f5a100f78aed920924739e17736fe5f38e0b327a629bfa5986542553ad5f5b3cf7cbbd424bd970c24c4e6e34f1c254559ec31068f241882859c041381c78 WHIRLPOOL 519dfce93e2e696614f63c1277e19f8b1d9107e0c3f3b95f138e8d2032044c90d4adcc95db3deb18d23c81e352008a192aef2b5651710d849d14e811cc178d82
-DIST SQLObject-1.3.2.tar.gz 261984 SHA256 f45ab1ef285b32e83732d5a2539245353fcf89e107e087713cb1e2f0aaeb0b89 SHA512 10f706b2baa611e0ff4262f3ff4b63300cbd6e1c6cbb7b5eb43d2cc9c15a25a8d65bf07273278c78ea5b0fd086d9e78de72223e86ba46cf4a07837ce44a61d73 WHIRLPOOL ab0021890ef18893eccbdfab8b26bf0698a1816a16495fb2e9044bb1e87f920707f5efe2b6216d95c0a0d2f28b02c4afd5b7b7e5380db81edad624236cf9787d
-DIST SQLObject-1.4.0.tar.gz 263094 SHA256 d7c27f488c9d28ededad0420416d67b5abce07e92d339cb90dc2be9febaa4a18 SHA512 d9cdc7402f5437e1eb57889c6f200886ab72099f840b8ebce6bcce434adf8ff8f2c1eeb23a2849a95ce75b0bc5592c9a4ef4e4e4e6349a23133127b1e62308ac WHIRLPOOL de1f7609c8cf1a0aeb39eb69a1b730e4db9f4490beeb9a2283ba1431ddb65d3be199f0e631340287b04298ab4fedbd46f9ea13b36c9d99e13648656113713409
-DIST SQLObject-1.4.1.tar.gz 263370 SHA256 033bc56606a9d10d34a0f12141f56fe622bf0b62f3b11f3dd91fa0b5827a31ce SHA512 23ac9896d31ed1aab0f1fdf2b8dfb253f07af3f5f993ae3ff88551d813f91ab25ac3e491041c34c9950c8162baf540a8f5c1679cca0d589ede99fecb77d17df6 WHIRLPOOL 68fbd0449a0907fafc471f113289d47e61e6b00907d2f95f0224c6be6f411766d9191a6bc50f4bdb0205bdcadeb9258a825baec65b2b9c9448fac9686ecd32fa
-DIST SQLObject-1.5.0.tar.gz 276189 SHA256 ff39291437670b8533921493c7f89ea6a826fbe365be87adc237433c8a80e4e1 SHA512 e595881ec899f0e09cda2da979294dc9fcc97f3eadeeb4b1939b0b6824b3dc594579fb8f05de6bda0fae93145945ba3d7afaf94cc3c7aa43463a3d06e8a01163 WHIRLPOOL 330a42fee753a217f2099b4c8c46759e581bca786324f354e4c859457003129378c5d4433b2c9a52f699691ecde1cec27dd7b31cccf55e1155a34c15814a6645
-DIST SQLObject-1.5.1.tar.gz 276686 SHA256 68f86ae270b59f9cb57eadbd6b82264c2684cf0ab582e62e1188d5f8d1456a8d SHA512 7de63b667a0e4f586d1ead15f855bc25cdfd99e30b7f0ea41ba1f979eeae42b7d76be4520d71b63b0681704aa4843151ce755c3fa992b0774532890cc0715f15 WHIRLPOOL 572b22bd03d422e9b78be18277367e6931158e26a878b99c0a11cdd0e97543ecc10feb36f5fdb7d28d8ad50f0d51a2d5ce6d1d359a522c2c07b4d3ca2641f04d
 DIST SQLObject-1.6.0.tar.gz 276441 SHA256 7299dc568d074ea8cb418bf3ad64a5ed380ae6c18be381519ead6c6a2e578b95 SHA512 b3e9d58027f0de2847e6f30516fb153a871284b23aa033089f07e6351be3953e9d8de46091245db3f34aa2a1aeef0a4f2ae252de5b21d9788f72fd7513459731 WHIRLPOOL cb33c3663b9552892613bcdbfde170d1839e8593ea6ff1891dce31ecdc13750390717c53260863c39cc21bf3e171fa6f8b2de8c7d1a572a9a071f80b9987da4b
-EBUILD sqlobject-1.3.1.ebuild 1343 SHA256 3569c254c88eda68df7e54cbcba982fba6cd86190e4de3560d8c36acf476c02e SHA512 60c8f14a4fe2a9fc948d6daf37a27e0df785f4fd647ce5250d4a7aafd42b84ef7946427edfe2ef99a54eff1cbce3abda23f3aadbb394eb902f601f1dc404d610 WHIRLPOOL 81d2b9fb154c5e82ac357bfa5579fff654996b2752c478f23c5a0396a966f6e94b5b466191aa4692350abf31ca5890b7a6a6487f21c3f57f5d0c2ac05c854c66
-EBUILD sqlobject-1.3.2.ebuild 1343 SHA256 06605a855e479980f2fbb5b3d611923e2bb6f8b0678f83dcd28d425e447b7222 SHA512 1c89b5cc81cae590a421990e32d9b3b6f83d4b49f81ec43959a3933aa45c279014d7e119c49bf81fe1640e87078a6eca61d393e93cb3c5269e3b8bd61d041a04 WHIRLPOOL 17bb7b1d4bda7edd0e7acbcb3dd688009cdef0566bdfde9939a9c549557b8a7561b94d60a63890a3454d25115d8d317a56e8c4d03edc73f7b5d2edb9a80de4cc
-EBUILD sqlobject-1.4.0.ebuild 1343 SHA256 f89b83395df9b386e0a547e827d0e10f4c1d4982cc2297cadc068b5b443b5810 SHA512 348bb170be09ef26680ebfd0acd0edfddec56bf54fda6ffa5bd36d5296c44ec323690f45d02443d9232a7a65a376df7fb978ee41c15c7d2aa5d5770d72036841 WHIRLPOOL fdf029a52b8f764029e53d849392954f58e2e1536a55da601de9226faae1696670e05e6498ed180ac863a7eeb731e4c0bd3ad62f265bfb1d3b830d191ee490dc
-EBUILD sqlobject-1.4.1-r1.ebuild 1301 SHA256 6b7fa9ebcce8a1693050e48a74a916238bb101e14d26f990d273bc7f88a0b2f1 SHA512 dc800a746ad3ce98352b7abe14662283626548d2dd02b7008da43ac50e499f9b1d8e1f4d28b3f48e0c220316cb7e78359d60eed5081e96cf481e9ae40855483d WHIRLPOOL 4c3163c5c270dc6c4be4e2dc38cb60d10d291ee18c4d816bc1b31e861532a2cef7063fb98702f40d59f2c801191461e1948c5182d1b9c11ebbfc5179c5eaecd1
-EBUILD sqlobject-1.4.1.ebuild 1343 SHA256 f66a9e100ea294a9d4c72d106f4e37354c378ec06f5ede3fe4adb3a5eeb02d61 SHA512 cf9b69b50f483360e8ad1322072ec48d689a51c9e15072f0f0163979cec1485753fa29939d8ce03199878d5f31623144867294343ab2218a3f670d77cfaac357 WHIRLPOOL 6c3f0133ecc0a4f289d0e22d0198eedb572e0583bc7bf0638cebe1b4e8556c947cb1e28640f7b6147b215f1f20b58979892c58358e81fab61e9d88b820c530f4
-EBUILD sqlobject-1.5.0.ebuild 1298 SHA256 6da2bfbb7db145bab53715e48972953b6bfd15d49252651f5dc14c0ac4601b1a SHA512 5546987a374dd560b7b30174c28e9ee0b87f17043a1336bb2d1a40ee2878a3914958566e204e717efa159c42d40767c6d16c861fbecc16ca0665b355fcfbab2d WHIRLPOOL 160c546fe26721a292d8649eb64f821102a24a6d3ab878e0467ebe1995535838851c9c38c8197007bb6552345fd3c6034ae8f42178d5de1d7c1cb1cd0968c2ec
-EBUILD sqlobject-1.5.1.ebuild 1298 SHA256 5f597a79787114af6acbcf008c1114c5aa5a021f0afd384e62e8281beaa79ed6 SHA512 9241974cb725795870baeab7c1de5939404e9eb0359b3e4c8b62cf30b4dc19e4c176a41058484686f25bbb80dd44ab4a181a6c7caefa4d353fab8e5d56c9e8d9 WHIRLPOOL b5f5b3ce92b27a9c6735df7c21d97806ea821f96e765475483236261eaaa153496dcbe730d8dff12f74a7e8109d4fcde49985b3412204e1aa51e2dee6b1de20d
-EBUILD sqlobject-1.6.0.ebuild 1273 SHA256 f18a2bb9fbd5c856330133bd935e9841c30a07660762ceb602cf1aea70b56754 SHA512 9070f7fae18dba8a95fef1c2bd8ff22d97cb95e05a0a5fde64297640788e749266f176e4add71afb73ff857e7beddaa7e5341ba2b13f034ecf6f27a528ff1f45 WHIRLPOOL 53a0454a57f21a2f6f5db6dae62b095e73696f3a4ef549fb8bb22bd61fe496b9d052964aa577a066d469eface89b015fa419680b0e13fb09a2c6a78a42b6a27f
-MISC ChangeLog 9414 SHA256 afe01db18c0e95f4b9381c55753d7bc681e8523631d7a2eb1bd1f9e500ea9443 SHA512 939e9de3d13e794e1996ad3d4f7af70ff45f7bb67e1449df4deb4d5664354d4443bdc57c30c2379231f956fb4c97a6e43d7ff58d6bdca21f4c975fbe7f21620e WHIRLPOOL 711337b847c277a0ee85efc9aa6968ebae6507efe3e5bdf134a3f2bec88e785ab323394af99d898852426b0e95fafd4f3935ac3e821935fcc30a91f41e84910d
+DIST SQLObject-2.0.0.tar.gz 885752 SHA256 07246e9888736a0486e44d8254bf83f5d11a4588aa7fddbd1340eaa94f0561ff SHA512 3a439c1ebf6b30fd1589fca1d45e0e4aafcf279d80a96f56ec4a9ca759fcaca95ac3a828027a3c84938cf50c4b5a1c3560ba680086af7df85af20694bb74e1ee WHIRLPOOL aad14cf9a7c1c422816fc99e2b954d8bed49a1c4ac7d9a3d1b1a2692f5704e555a5bfeefdeaecabf18f520d6aee597484f1380c500bdabd8a3ffeb35de4d72df
+EBUILD sqlobject-1.6.0.ebuild 1225 SHA256 6253aa0e31f00ca100b8ff2a2960533a680390ec4cf0da6db0758e57ac04288d SHA512 2246a4e57a502351d41671d71981be464a8ca01230fc6ac2706c235b54e9c89cc8db38790ba4e1ae24a59dd1c23649e46af92dc7a234bf182f0c77255b5366e3 WHIRLPOOL cf5089b5eb1b9e221d70aa801389bcd17b144b77f4acab4df3ca0d12c434c66322dff24d0cc73a1961732a0bbeb3936888b6be898a65e0b202122398f211cb4c
+EBUILD sqlobject-2.0.0.ebuild 1110 SHA256 6cfa42ef53622c64f1bd2e5ee09d0000e35b341d90712e5caac814f025f72f9a SHA512 11d7aea2a1b874af3885bedf2593b4802729ae61ac8c8a51abbde7b8863e2a76e1dcdc017e92f400f455a929b9673ad0279179cab68fe318afff92f68dd27716 WHIRLPOOL f6c164f31e600cb462f31627d86c2caf9461882c82a7af9f68d9e1969777c017a180d2c60e3faf4c57278de0f4d3c928eedb21105c8108a1bf3d926e1141dbdb
+MISC ChangeLog 9798 SHA256 9b9481df00eda4e1cbac7aa13736500b940db81be63e2555c6c6c5dc871091fb SHA512 05af1fb972c995d0eb9404c7af13d769eec48410e904ff4c43fda33d79355b9660e65923b8882bf96ec320231a2ffa99d921a649bfe3a86089649de11fb257c3 WHIRLPOOL ef82787fba9670b680bb9d246dd1ac033c45ce58deb62dc390748496e206be9c0872bc9845a517e8e4170c72a21f2099c62ea720bcfeed2c3b15f158a65eb9fb
 MISC metadata.xml 740 SHA256 4d98f9f9734633a4c4d9109a35e13c5be3ad6765242d05cbb26ab4b0d78a7b3b SHA512 656ffd1a467cb72e365d76ad517e0fa792599c1f1993e78adf63f1090af95bba6ddc317e4d3353e4f999d5d410acf86d099b1d629ad3442fa2f856b40660079c WHIRLPOOL 9857cb5266b762403706b33d33fd67a5fada9f6a99a805cd7ac79ccce8692afff980adf11dca808f5e68ce4c185fa05089f5bcea04c24fa23777ef9b74d9731f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlN7aYwACgkQso7CE7gHKw0w6QCgi6i81jJ8E1azfQf8wtjRIQo2
-JhAAn0Du9MBfkG/N4N2gEFVVUUlNQDv3
-=3348
+iEYEAREIAAYFAlSnIxAACgkQso7CE7gHKw3U2wCfTFrhv37vHWHI+6NXS+cahaLu
+avUAni9EFx6jNjmCxIdH04YDLYxlRG9W
+=kQ4n
 -----END PGP SIGNATURE-----
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
 }