Set SUPPORT_PYTHON_ABIS (bug #308263).

Package-Manager: portage-2.2.0_alpha26_p6/cvs/Linux x86_64

3 files changed, 61 insertions, 10 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index f788911c5ae6..fb4b6c0a3f7a 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/speech-dispatcher
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.70 2010/11/10 20:09:53 williamh Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.71 2011/03/06 00:36:23 arfrever Exp $
+
+  06 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  speech-dispatcher-0.7.1-r1.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #308263).
 
 *speech-dispatcher-0.7.1-r1 (10 Nov 2010)
 
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 237a8db53b5c..c45914f0153a 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -4,7 +4,7 @@ DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a1
 DIST speech-dispatcher-0.7.1.tar.gz 1144818 RMD160 13f889c25341985ce2c75787f260dc999091b1f0 SHA1 be911de1ef334fa1708a7489f9dde51b499ab265 SHA256 a8a9cf299447df4645d36c649977e007a3050ccaecb7f77e2165001ec5794a51
 EBUILD speech-dispatcher-0.6.7-r1.ebuild 1930 RMD160 c4db76e3ca0150504b27e1c3c8d4c836acc14239 SHA1 6d120e8ec80c68aa2c46eefdc7ac8be0bdebb09a SHA256 c98dd993481cdff2ae9c3217c10e94b5ffcb814e70cbf1a416e9b834ed682625
 EBUILD speech-dispatcher-0.6.7.ebuild 1893 RMD160 3e83616f71d45f8a2991c15cb59c12cbfa7165cf SHA1 a6579c165093cddfa417060e05bc8d753de5a82e SHA256 28bc97b99c07085398b00681ecebe85a390f0fa7ab345d0022be91769de04457
-EBUILD speech-dispatcher-0.7.1-r1.ebuild 2102 RMD160 e8dbb4f69de2018377874c448d9cdd8b34d9d89d SHA1 32d2b96497ccaf0402770f644ba7b72419cb906b SHA256 3bc73825809f7d7d39d1c157d9ffa1070f0cc5d88bbb0e6fe1ee9d19a2b0e6d0
+EBUILD speech-dispatcher-0.7.1-r1.ebuild 3072 RMD160 f920d28b356158a027437ea0cf517c75ad1199e3 SHA1 ea46ff53c2b0a264e4aa65fe9ef61f5e7124e9d8 SHA256 a1737f77278700a264398c2d4c81a10f167231ed14ae46f5ad99df105742fd5c
 EBUILD speech-dispatcher-0.7.1.ebuild 1993 RMD160 a42f20589fa42f0a1d3f0460ceecb2650d73c57f SHA1 658d0a3fe3b86ae85bf1ec3e8863f2d3bc79d08a SHA256 dd6d742bf3ef81238d5a9b9bfdabb709b1f2537fbbacefb66d9ff8ded003b789
-MISC ChangeLog 12153 RMD160 f5a6c787b6046b47459dca8a008750378789d6da SHA1 1a21b5cd310edb637f552b93031c15b759943853 SHA256 58e97c79453cb15c47281f3be92cbccc1f642ad2e653d308ba2f63f6ea5fed0c
+MISC ChangeLog 12305 RMD160 d789575e009ba04184ad429d1f25f07ad8c48ac8 SHA1 57e3b3f70798e96c5b5693286aa13f8b0de734ff SHA256 26ad69e3c399caaf628f6df1d6bda8e6baaa9370eee04c46fae16770c4ed2cb2
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild
index 307b5ef53f88..86a273625fd9 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild,v 1.1 2010/11/10 20:09:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r1.ebuild,v 1.2 2011/03/06 00:36:23 arfrever Exp $
 
 EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit eutils
+inherit autotools python
 
 DESCRIPTION="speech-dispatcher speech synthesis interface"
 HOMEPAGE="http://www.freebsoft.org/speechd"
@@ -22,11 +25,24 @@ RDEPEND="dev-libs/dotconf
 	espeak? ( app-accessibility/espeak )
 	flite? ( app-accessibility/flite )
 	nas? ( media-libs/nas )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( dev-lang/python )"
+	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS += python/d" -i src/Makefile.am
+
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable python) \
@@ -40,17 +56,44 @@ src_configure() {
 
 src_compile() {
 	emake all || die
+
+	if use python; then
+		python_copy_sources src/python
+
+		building() {
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir src/python building
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir src/python installation
+	fi
+
 	dodoc AUTHORS NEWS TODO
+	local f
 	for f in clibrary clibrary2 connection_recovery long_message run_test; do
 		rm "${D}"/usr/bin/${f}
 	done
 }
 
 pkg_postinst() {
+	use python && python_mod_optimize speechd speechd_config
+
+	local editconfig="n"
 	if ! use espeak; then
 		ewarn "You have disabled espeak, which is speech-dispatcher's"
 		ewarn "default speech synthesizer."
@@ -63,7 +106,7 @@ pkg_postinst() {
 		ewarn
 		editconfig="y"
 	fi
-	if [ -n "$editconfig" ]; then
+	if [[ "${editconfig}" == "y" ]]; then
 		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
 		ewarn "and make sure the settings there match your system."
 		ewarn
@@ -74,3 +117,7 @@ pkg_postinst() {
 	elog "For festival support, you need to"
 	elog "install app-accessibility/festival-freebsoft-utils."
 }
+
+pkg_postrm() {
+	use python && python_mod_cleanup speechd speechd_config
+}