Version bump (bug #338897). Respect LDFLAGS (bug #339967).

Package-Manager: portage-2.2_rc97_p1/cvs/Linux x86_64

3 files changed, 116 insertions, 5 deletions

diff --git a/dev-python/pysvn/ChangeLog b/dev-python/pysvn/ChangeLog
index 13d1c63f62b8..f7c24e508b41 100644
--- a/dev-python/pysvn/ChangeLog
+++ b/dev-python/pysvn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pysvn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.11 2010/09/30 08:47:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.12 2010/10/16 19:24:48 arfrever Exp $
+
+*pysvn-1.7.4 (16 Oct 2010)
+
+  16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/pysvn-1.7.0-darwin-freebsd.patch, -pysvn-1.7.2.ebuild,
+  +pysvn-1.7.4.ebuild:
+  Version bump (bug #338897). Respect LDFLAGS (bug #339967).
 
   30 Sep 2010; Fabian Groffen <grobian@gentoo.org> pysvn-1.7.2.ebuild:
   Fixed pycxx detection in Prefix, marked ~x86-solaris, ~x86-linux
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 985ab024a4f9..db233a96ba46 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,6 +1,5 @@
-AUX pysvn-1.7.0-darwin-freebsd.patch 3424 RMD160 72ef610f51553867cf77b9cff2c8ef4af4b6b980 SHA1 9a2fe1b43ebc85ae0fe2bb5df9401a00bdfd3a5f SHA256 13aecd8a489ba8f237e0ebf6ee05a65729d83a0267e41f17fa98159f213449e9
 AUX pysvn-1.7.1-skip_root_test.patch 985 RMD160 e5479747d3d2eaf6be704d8a62aabb1b6ac7081c SHA1 4c84c61555bfede768a3cf3d54cf988e319800a4 SHA256 1ee21a57a9765b07e955a5ce5386153d68c90d35528ddbc4fb5020ae3d70b96d
-DIST pysvn-1.7.2.tar.gz 333643 RMD160 85026cff619aeefde622b677f7b6697269beab4f SHA1 e8afa0c1f56c82f13f5e17c7dd120cfa82c8a24f SHA256 2b2980d200515e754e00a12d99dbce25c1ea90fddf8cba2bfa354c9305c5e455
-EBUILD pysvn-1.7.2.ebuild 2533 RMD160 53489c55bdb1cc9eb55337ba3249597ca4819ad2 SHA1 2ba3489c3822317101ae42e6f65f1533d002192d SHA256 5c197ecdf14d12eeaf7fddcc19c42aa9259beb9b04f6c24d4be1f028a46094e1
-MISC ChangeLog 1880 RMD160 d04c11cc6207d268e98d25a6c2f4afc5d1a09113 SHA1 352dd199816d961e3a29cf0c506f73c15ddc4b50 SHA256 42735dfb27d873dace4ba9b4f7e1c40d026e0edb84cf3287e2b275a6ee50291b
+DIST pysvn-1.7.4.tar.gz 330984 RMD160 d08c71d7ee3702f39f4fe168a8cb8ca59793f8ca SHA1 6d75f96f756161653b13f73f09fa8310e572f59a SHA256 88ecdbe7fdbb31b74108a318e4b53f85b770ca4f88ca32fcc89ab4e39e44a7a4
+EBUILD pysvn-1.7.4.ebuild 2429 RMD160 7d4a973a043545f89e5b253b81b684735caeb5de SHA1 5c9a5dcd2ce0215993e6b2a25eb94c55dd006432 SHA256 65c9d979d22c9fce0d86cfda31f0c65663e777c8acc90f777cac8e2660237f87
+MISC ChangeLog 2131 RMD160 64b2d08766f40730f94a94e9af492fae241932a5 SHA1 20443ad60f7330ff90a51d4bfb78643032028e5b SHA256 ce9c8c3acde8e0c7ae7e83bfd2388c09928b73f4d6f59f0f86c6e31e01e94f72
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/pysvn/pysvn-1.7.4.ebuild b/dev-python/pysvn/pysvn-1.7.4.ebuild
new file mode 100644
index 000000000000..9ddf19bd4470
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.7.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.4.ebuild,v 1.1 2010/10/16 19:24:48 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="http://pysvn.tigris.org/"
+SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/pycxx-6.1.1
+	dev-vcs/subversion"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+src_prepare() {
+	# Skip test test-06 if executed as root to avoid failure.
+	epatch "${FILESDIR}/${PN}-1.7.1-skip_root_test.patch"
+
+	# Don't use internal copy of dev-python/pycxx.
+	rm -fr Import
+
+	python_copy_sources
+
+	preparation() {
+		cd Source
+		if has "${PYTHON_ABI}" 2.4 2.5; then
+			"$(PYTHON)" setup.py backport || die "Backport failed"
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+src_configure() {
+	configuration() {
+		cd Source
+		"$(PYTHON)" setup.py configure \
+			--pycxx-src-dir="${EPREFIX}/usr/share/python$(python_get_version)/CXX" \
+			--apr-inc-dir="${EPREFIX}/usr/include/apr-1" \
+			--svn-root-dir="${EPREFIX}/usr" || return 1
+
+		sed \
+			-e 's:^\(CCFLAGS=\)\(.*\):\1$(CFLAGS) \2:g' \
+			-e 's:^\(CCCFLAGS=\)\(.*\):\1$(CXXFLAGS) \2:g' \
+			-e "/^CCC=/s:g++:$(tc-getCXX):" \
+			-e "/^CC=/s:gcc:$(tc-getCC):" \
+			-e "/^LDSHARED=/s:g++:$(tc-getCXX) ${LDFLAGS}:" \
+			-i Makefile || die "sed failed"
+	}
+	python_execute_function -s configuration
+}
+
+src_compile() {
+	building() {
+		cd Source
+		emake
+	}
+	python_execute_function -s building
+}
+
+src_test() {
+	testing() {
+		cd Source
+		emake test || return 1
+		emake -C ../Tests || return 1
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	installation() {
+		cd Source/pysvn
+		exeinto "$(python_get_sitedir)/pysvn"
+		doexe _pysvn*$(get_modname) || die "doexe failed"
+		insinto "$(python_get_sitedir)/pysvn"
+		doins __init__.py || die "doins failed"
+	}
+	python_execute_function -s installation
+
+	if use doc; then
+		dohtml -r Docs/ || die "dohtml failed"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc Examples/Client/* || die "dodoc examples failed"
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize pysvn
+}
+
+pkg_postrm() {
+	python_mod_cleanup pysvn
+}