* [gentoo-commits] gentoo-x86 commit in net-p2p/deluge: ChangeLog deluge-1.3.5-r1.ebuild deluge-9999.ebuild
@ 2012-12-20 20:07 Markos Chandras (hwoarang)
0 siblings, 0 replies; only message in thread
From: Markos Chandras (hwoarang) @ 2012-12-20 20:07 UTC (permalink / raw
To: gentoo-commits
hwoarang 12/12/20 20:07:25
Modified: ChangeLog deluge-1.3.5-r1.ebuild deluge-9999.ebuild
Log:
Add PYTHON_ABI to -lboost_python. Bug #444522
(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Revision Changes Path
1.179 net-p2p/deluge/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.179&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.179&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?r1=1.178&r2=1.179
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- ChangeLog 17 Dec 2012 20:40:22 -0000 1.178
+++ ChangeLog 20 Dec 2012 20:07:24 -0000 1.179
@@ -1,6 +1,11 @@
# ChangeLog for net-p2p/deluge
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.178 2012/12/17 20:40:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.179 2012/12/20 20:07:24 hwoarang Exp $
+
+ 20 Dec 2012; Markos Chandras <hwoarang@gentoo.org> deluge-1.3.5-r1.ebuild,
+ deluge-9999.ebuild:
+ Add $PYTHON_ABI to -lboost_python. Bug #444522. Thanks to Avner Peled
+ <avnerus@gmail.com> for the patch
*deluge-1.3.5-r1 (17 Dec 2012)
1.2 net-p2p/deluge/deluge-1.3.5-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild?r1=1.1&r2=1.2
Index: deluge-1.3.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-1.3.5-r1.ebuild 17 Dec 2012 20:40:22 -0000 1.1
+++ deluge-1.3.5-r1.ebuild 20 Dec 2012 20:07:24 -0000 1.2
@@ -1,11 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v 1.1 2012/12/17 20:40:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r1.ebuild,v 1.2 2012/12/20 20:07:24 hwoarang Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-inherit distutils eutils flag-o-matic
+inherit distutils eutils flag-o-matic python
DESCRIPTION="BitTorrent client with a client/server model."
HOMEPAGE="http://deluge-torrent.org/"
@@ -37,14 +39,22 @@
setproctitle? ( dev-python/setproctitle )
webinterface? ( dev-python/mako )"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
pkg_setup() {
append-ldflags $(no-as-needed)
- python_set_active_version 2
python_pkg_setup
}
src_prepare() {
distutils_src_prepare
+ fix_boost_python() {
+ # fix libboost_python. It needs the python ABI on the side. #444522
+ sed -i -e "s/'boost_python'/'boost_python-${PYTHON_ABI}'/" setup.py \
+ || die "sed setup.py failed"
+ }
+ python_execute_function -s fix_boost_python
+
python_convert_shebangs -r 2 .
epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings"
}
1.30 net-p2p/deluge/deluge-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?r1=1.29&r2=1.30
Index: deluge-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- deluge-9999.ebuild 22 Apr 2012 17:37:23 -0000 1.29
+++ deluge-9999.ebuild 20 Dec 2012 20:07:24 -0000 1.30
@@ -1,9 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.29 2012/04/22 17:37:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.30 2012/12/20 20:07:24 hwoarang Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils flag-o-matic git-2
@@ -39,14 +41,22 @@
setproctitle? ( dev-python/setproctitle )
webinterface? ( dev-python/mako )"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
pkg_setup() {
append-ldflags $(no-as-needed)
- python_set_active_version 2
python_pkg_setup
}
src_prepare() {
distutils_src_prepare
+ fix_boost_python() {
+ # fix libboost_python. It needs the python ABI on the side. #444522
+ sed -i -e "s/'boost_python'/'boost_python-${PYTHON_ABI}'/" setup.py \
+ || die "sed setup.py failed"
+ }
+ python_execute_function -s fix_boost_python
+
python_convert_shebangs -r 2 .
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-20 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-20 20:07 [gentoo-commits] gentoo-x86 commit in net-p2p/deluge: ChangeLog deluge-1.3.5-r1.ebuild deluge-9999.ebuild Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox