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

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 73 insertions, 14 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/Manifest b/dev-python/apsw/Manifest
index 5a5a23e56b7f..95e6ab2b6c47 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -4,18 +4,16 @@ Hash: SHA256
 AUX apsw-3.6.20.1-fix_tests.patch 336 SHA256 87cafad98bbdeeed0cfe82ca98b2f7fa9768793535abb1bc7562de8c52f2adb1 SHA512 42dbd31ed6041bb387a5d31c2e7302e361da94c2d150216b7bb347794a92b071a6a3feecdcc7bfbd2810272304ba1df63b0d022073c6f022c594a5f13b04d8a4 WHIRLPOOL b1933540b99df955f8e4593c424d141aefb179bd63b164a7ac2c253b396c029e211972960071c32b8615d53b9d1483bf1a15298d2d6bd84292188630511afaec
 DIST apsw-3.7.13-r1.zip 632647 SHA256 5f26b670069b1bde2635a219db2314c674bb7d7d9ffffd24fd8a32ee637eda2c SHA512 abd0e59575b66ce70b8edded1fcb46beb259edb2b05438881144e041bef7e541277c4fed66863430e75b8846752b6b9776f179fd8accf04b9095b4253cf7e58c WHIRLPOOL 94b05fdd660460091720629ca49fe553de77feb03b33ebf5bedf2c4c0fecc772c30b2f5ea04561ae1b664d023bf6f1ee7b49a8204aa16c424aadf9bebc639e07
 DIST apsw-3.7.14-r1.zip 676597 SHA256 2ad5f46e68eb056257abe164a3615297355c3eca482dc7f9c8434450c8f73314 SHA512 e4a6615ae407abacc003a5369fcbe912fedeb250f915c076a5165775f2141c2265d02b175730db9f6d808d5bbff9c355b2097bb3afadfeec575cd8771a29df8f WHIRLPOOL 16fc0bdf0b81aa0567055889ab1dbc5e01d293362d65735d1e752f16edf3171cd8728f529e2d2682393bb2c2d3135853c09825ed922d40eadc2982ad5296a434
+DIST apsw-3.7.14.1-r1.zip 678959 SHA256 690277428925231057382150a6073c2bea8026d463b0b9bf25f2655ab802c6be SHA512 7ec1cf295e7f593bf6e1d79bde9b18e0398199b0505a25d8f88ed33932626207a9805949e9f55ad01691100c2aff0cd1f17a73d30e8be41ee896c37999cfac1e WHIRLPOOL f34105430522d301f62bc5943b6b3a3ade1314d16783aa5010f4e1b81f9541255e96a71526f076b2bbb08850955ddf7e5d72ed9cf599bb2d87f30b06d0f95fde
 EBUILD apsw-3.7.13.1.ebuild 1319 SHA256 2477c617f81e2c54c060af5dc35fb12642f2d262e6a232c3022dbed9b44d3166 SHA512 b992e247fc4d9b04c75368272f45e8702e93e3a272176a6e9f6396a3dae78221b95a101dea013407a392c9029ce23688fb90f54751df63d6b4110692736d8854 WHIRLPOOL 61ad6f12c20589bd6e24be57db2a27d54ee237b6e7f75917286e1296d90a5daad6643a8e4b434f541be31f110706fe34a5768e6904b54977a3c1182a53968180
-EBUILD apsw-3.7.14.1.ebuild 1321 SHA256 87239b18aedd580894083e2e2ed214840baa4a2c4e5a622e2813fdb1a7a6f83c SHA512 5f81916fe7171c3603ab64da3ce5cb82dbb697d641539b830ad0e00470e7649dec390c7a770127c5e2267838c4257dd29fd334e36ce417220776328a1ac7e171 WHIRLPOOL e9d81236461a94798956d4651a30ab249322b1d2417eb09f1114ebeb876817337d9e1ec60c8f65dfef7820fa82dc6170ff316b52808bb1c3ad8e414a2d26ff87
-MISC ChangeLog 7051 SHA256 3311a345cc8059366d44457c7c377b10c6ad0584abbf46c6a29f6976a65cfa94 SHA512 67a28bcfda5a64a08d40e4ed693b4c5e0c637306beeb3755b84c47f329134358fdb42599a352266ea0464455fcee7102b0ed5ef8c7cd0439f2c0fe9deb4e42af WHIRLPOOL 200f0571b420a359c0c54aa156aa01d3672edf9a7d9b6f0b096ca50d9e78429e6ecfabb3b88124da97e7e0980841fcd2f57823258a64758ed1ccc5c7def432d5
+EBUILD apsw-3.7.14.1_p1.ebuild 1275 SHA256 3e1ea217417c965edb9da89702a4c30be71ebae864b1200d62adec622ae0fe0b SHA512 e603de1f43892a286f5eb11f73f466d63956588412389efec7209e16882d7d9ca308ba0077e9c6ce52812726869084dffddb34cd7bcd4b5c16cfadbe82aabbd9 WHIRLPOOL f0e4fb8d5000f2fed1728bb222a744d20a42a8edef6928ce2cded73553892fe1d905b0001c454175ee12f5b80253b8c36c121ce9875b7408b544f40728ee32ae
+EBUILD apsw-3.7.14_p1.ebuild 1273 SHA256 1d4d8f8d471e4c3b7b4b355b905d20d2e8442724fcdbe11a74147e1d5b08991b SHA512 c276f76ef6c425f35c1d2a863495262fcd20890a4d21ea4941665d0c3a4c3c90c0ca285f2e0d1ac0c9d3887c0d93a72d7c87a0e01030a92b8292b38e88d5bdae WHIRLPOOL debff4cd341d83768632ae269bcae5e90336bd11c2fe10d47507b167b142407965d9f214f0b0472a422d445cea3caa88a715c96ba2a3b83fbf4a6cec8868072e
+MISC ChangeLog 7372 SHA256 2dd081a1987346f64434e69685fedfd3bb7f6a148f70afae5940d95d84b983ee SHA512 7f2287d43913ff1fc8faa24ef74f37f5de96ae262b5aadd129f2320767ed96339ab3ef3ac0e759bdcf2fdf85b833acba96e34cadfd551d1b9cc05a6194ccc7f3 WHIRLPOOL 5faec12b29b29ffc072f7bcc61a1948049288d448b9a7f463cf31fd04c2df4291bd786a42bb80ddb94a06469305bc006ba5849469b1166e7b3fb22b1431a809c
 MISC metadata.xml 588 SHA256 f0add1070875ad74f4e8ba5e8d8b8ae109c48502909998d1559494aa4e1255b9 SHA512 8cd07f201e0b4b6b0303cc722e4216efe9da23ed0d17cbda97fd64d72c533ead2e2e6645969e07501a57433e3e93ee1259014991f15926d8b284e6eb865257d6 WHIRLPOOL 2d3c3cece314d2bdd5bff3054d46ae9dfd515aa97a13eb812c393eb452ef8c48e03d56d480ad6c5624e2095689744aa316d0aa5c7593d7f408619c4e105063ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQuWMxAAoJEEqz6FtPBkyjiIwIAKRj4OubUkXrDYhaZylgLYR1
-Pz83Pk7/Hw0QzrIkGQTqMKc4IJ3o8fH/VnaIrfBU3pEsgC542tMHXDUIEMDK9QDk
-D5fOTCF7u696iFjN8+EZwXXesgxZvK+1McJGDJS5EP5AzED4IbH/jvZXgIRaG11m
-BuxPZ6LTK3D5Ab9kTWNf7Jo/o2s1mwW4sm5NmcHHWopdZ9btvYX3QVMlgFUXpZF1
-WoZTiI5B10ugEiZ9VlnqXomxPWwp7BZVRf2HDtN7AadcXYmG7U+hOpgdvx8eZu+n
-5p2wuiE7voJf7YhLuUUEg3putyzrvkUucxP8nX9myCcW3FhIGu5KnkRh19CY5+4=
-=LZ2d
+iF4EAREIAAYFAlDDqtEACgkQC77qH+pIQ6RgWAD/YYwzmsGU0FLQ6QZVUb1CUNVR
+dvqSouXNjc+2QrHMxOMBAI88nk02EJ5aihGO5UUuBPk+KpOTzHM5HSZEyvVp9O89
+=5i9B
 -----END PGP SIGNATURE-----
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
+}