revbump; convert -> distutils-r1, drop refs to package kinterbasdb long purged from...

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

diff --git a/dev-python/orm/ChangeLog b/dev-python/orm/ChangeLog
index 59e4838bbee668b56084ae046029b3e96161210c..9f9f0d9ac8111dc716fed3ac2db96350ad6d91b8 100644 (file)
--- a/dev-python/orm/ChangeLog
+++ b/dev-python/orm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/orm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/ChangeLog,v 1.10 2013/11/06 05:21:10 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/ChangeLog,v 1.11 2014/12/23 03:06:57 idella4 Exp $
+
+*orm-1.0.1-r1 (23 Dec 2014)
+
+  23 Dec 2014; Ian Delaney <idella4@gentoo.org> +orm-1.0.1-r1.ebuild,
+  -orm-1.0.1.ebuild:
+  revbump; convert -> distutils-r1, drop refs to package kinterbasdb long purged
+  from portage, add REQUIRED_USE to ensure use of a backend db, rm broken old
+  version
 
   06 Nov 2013; Patrick Lauer <patrick@gentoo.org> orm-1.0.1.ebuild:
   Shorten description, make repoman happier

diff --git a/dev-python/orm/Manifest b/dev-python/orm/Manifest
index 5c3db60fd5d54e6a1fd4af9addd8406b78f63544..042a51d839ba727195d5374d2237b23f58d7adaf 100644 (file)
--- a/dev-python/orm/Manifest
+++ b/dev-python/orm/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST orm-1.0.1.tar.gz 121523 SHA256 a087397bc1ef710fb05b139fa5194337b31d0c55a078a023fad0410566fdd2b5 SHA512 5b222a30b5f1dc7866bcc1a0fc92f9a5ab159a6c10b40c74e0b67dcdaf32683a73908538d80426006fd99fd5f79acafef7f3cbb656de761ac945ea05fb9e9398 WHIRLPOOL d6411f4fe6af376c22a9d452d07fc05966f2d3e2721d7f5818b243a511fa1e415c78bddbb2e0a90be070e5d04c5cd07500bc1e7cf4387016906e6ea2d1af08e9
-EBUILD orm-1.0.1.ebuild 985 SHA256 df1ce03473fdc6a1b66fb1948392bd62b3dbc745a09dac5cfa3a3c390538abfb SHA512 13c8d4c6dcb19f8550466e98629a94450b75a1902f9c5423584c998a558822fc7b07317f7c9f49a911d5489378993a4c9fe57a276b9382ac8f03228c265eff01 WHIRLPOOL 1794ff383381ba7fc5e031c9af51c0721fb255acd089c06e6a90d3ed2c7cb9aaa21fe5d87757be26178b32d0b4ada0830f73ef740446986810ff256b55368e63
-MISC ChangeLog 1262 SHA256 fed59fc1269881c2d2fc887d060bb4d6a2f74363068ae1dbffa39312325da00e SHA512 026cbf962fb4e56457245ea83c06206c629e98bfc14aea41967f106cc5ee013f1b4a89cc8895f7a3ee68b92c5d38e582f67b4fa6ea328fe17b76862c9bc4eb0e WHIRLPOOL f0c32cc0fdf8fafb6f78c231db458ed5aab33370edbccc576789b8838dbe6d221733d68bfe1f24d9b92fb1c334076c679ad3383ceae68bac173c9abc2918e205
+EBUILD orm-1.0.1-r1.ebuild 810 SHA256 a9a0f61111183340472bc201424a09a671d15e3f0af5e1ebbe4af702deca2a94 SHA512 40ee9b9f1e81041ba56e16fab260d980268e083d59286988843bc9ad9bbe0ea76fe42e40d0d5139f2da19f6daf1b6a1a1bcf3f047d980035de9c3f4ed342634a WHIRLPOOL ba6098702f3c3927b623f14feebab8f63cc98363c447c034d9d3cc2444d698a74eaa1824c82151c03cef235b458fcb9523c343e1a93ac4352e384b02dc3d1da1
+MISC ChangeLog 1552 SHA256 401570ea722b8686c4d5dde932a716a76bc7b4143ae46d14945ec311e3dd22d7 SHA512 05cabcb00457c0e692d486ada81054b230d88b9dff42dc956027f0cb46f80d3055e052e86e64a0338fc29b63974eb4735dd501a1e93f1baa6df47d8a9044a1bb WHIRLPOOL e2b5c438f5283e81eb73855eb2eed2540c2f95afccb77df7ebad2e1d9793ee047956ce8d96846faa6e329006a3dd97fb705f0b168f9a358bbbb0dffcffbcf30a
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSY3GEACgkQso7CE7gHKw3Y7wCgo4Ka/3LUK67eCuar02N1VfbX
+fBkAoKU8S2BxWxmyv0OBdaDkXhbgY6VH
+=22va
+-----END PGP SIGNATURE-----

diff --git a/dev-python/orm/orm-1.0.1-r1.ebuild b/dev-python/orm/orm-1.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..a12f0a3
--- /dev/null
+++ b/dev-python/orm/orm-1.0.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/orm-1.0.1-r1.ebuild,v 1.1 2014/12/23 03:06:57 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Object Relational Membrane is an attempt to write a minimal Object Relational Layer"
+HOMEPAGE="http://www.tux4web.de/computer/software/orm/"
+SRC_URI="http://www.tux4web.de/computer/software/orm/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres"
+
+DEPEND="dev-python/egenix-mx-base[${PYTHON_USEDEP}]
+       mysql? ( >=dev-python/mysql-python-0.9.2[${PYTHON_USEDEP}] )
+       postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mysql postgres )"

diff --git a/dev-python/orm/orm-1.0.1.ebuild b/dev-python/orm/orm-1.0.1.ebuild
deleted file mode 100644 (file)
index 4c66b28..0000000
--- a/dev-python/orm/orm-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +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/orm/orm-1.0.1.ebuild,v 1.5 2013/11/06 05:21:10 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="The Object Relational Membrane is an attempt to write a minimal Object Relational Layer"
-HOMEPAGE="http://www.tux4web.de/computer/software/orm/"
-SRC_URI="http://www.tux4web.de/computer/software/orm/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="firebird mysql +postgres"
-
-DEPEND="dev-python/egenix-mx-base
-       firebird? ( >=dev-python/kinterbasdb-3.1_pre7 )
-       mysql? ( >=dev-python/mysql-python-0.9.2 )
-       postgres? ( dev-python/psycopg:0 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       python_pkg_setup
-
-       ( use firebird || use mysql || use postgres ) || \
-       die "Using orm without any db makes no sense. Please enable at least one use flag."
-}