Version bump. Adjust version numbering to make tracking upstream versions simpler. Thanks to Arfrever for pointing out the problem.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 66 insertions, 5 deletions

diff --git a/dev-python/apsw/ChangeLog b/dev-python/apsw/ChangeLog
index 6fc3a5d2c0ed..5fe7b290f18b 100644
--- a/dev-python/apsw/ChangeLog
+++ b/dev-python/apsw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/apsw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.52 2012/12/01 01:53:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.53 2012/12/08 21:02:06 floppym Exp $
+
+*apsw-3.7.14.1_p1 (08 Dec 2012)
+*apsw-3.7.14_p1 (08 Dec 2012)
+
+  08 Dec 2012; Mike Gilbert <floppym@gentoo.org> +apsw-3.7.14.1_p1.ebuild,
+  +apsw-3.7.14_p1.ebuild, -apsw-3.7.14.1.ebuild:
+  Version bump. Adjust version numbering to make tracking upstream versions
+  simpler. Thanks to Arfrever for pointing out the problem.
 
   01 Dec 2012; Tim Harder <radhermit@gentoo.org> apsw-3.7.13.1.ebuild,
   apsw-3.7.14.1.ebuild:
@@ -236,4 +244,3 @@
   02 Apr 2006; Alin Nastac <mrness@gentoo.org> +metadata.xml,
   +apsw-3.2.7.1.ebuild:
   Initial import from bug #100296, thanks to Lorenzo Luengo <loluengo@vtr.net>.
-
diff --git a/dev-python/apsw/apsw-3.7.14.1.ebuild b/dev-python/apsw/apsw-3.7.14.1_p1.ebuild
index efa03dda6c49..c638d445d3da 100644
--- a/dev-python/apsw/apsw-3.7.14.1.ebuild
+++ b/dev-python/apsw/apsw-3.7.14.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.14.1.ebuild,v 1.2 2012/12/01 01:53:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.14.1_p1.ebuild,v 1.1 2012/12/08 21:02:06 floppym Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -8,7 +8,7 @@ RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
 inherit distutils eutils versionator
 
-MY_PV="$(replace_version_separator 3 -r)"
+MY_PV="${PV/_p/-r}"
 
 DESCRIPTION="APSW - Another Python SQLite Wrapper"
 HOMEPAGE="http://code.google.com/p/apsw/"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-db/sqlite-$(get_version_component_range 1-3)[extensions]"
+RDEPEND=">=dev-db/sqlite-${PV%_p*}[extensions]"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
diff --git a/dev-python/apsw/apsw-3.7.14_p1.ebuild b/dev-python/apsw/apsw-3.7.14_p1.ebuild
new file mode 100644
index 000000000000..03e97e2b5f6f
--- /dev/null
+++ b/dev-python/apsw/apsw-3.7.14_p1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.14_p1.ebuild,v 1.1 2012/12/08 21:02:06 floppym Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+
+inherit distutils eutils versionator
+
+MY_PV="${PV/_p/-r}"
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="http://code.google.com/p/apsw/"
+SRC_URI="http://apsw.googlecode.com/files/${PN}-${MY_PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}[extensions]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch"
+}
+
+src_compile() {
+	distutils_src_compile --enable=load_extension
+}
+
+src_test() {
+	echo "$(PYTHON -f)" setup.py build_test_extension
+	"$(PYTHON -f)" setup.py build_test_extension || die "Building of test loadable extension failed"
+
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" tests.py -v
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc ; then
+		dohtml -r doc/*
+	fi
+}