[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/

[Sergei Trofimovich]

commit:     998de2831a15b5d8635babc38ed57292bee6d491
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 14:45:16 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 14:45:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998de283

media-sound/xmms2: backported samba detection fix

While at it updated to non-deprecated python and ruby eclasses.

Package-Manager: portage-2.2.28

 media-sound/xmms2/files/xmms2-0.8-samba-4.patch    | 30 +++++++++++++++
 media-sound/xmms2/xmms2-0.8-r2.ebuild              |  1 +
 .../{xmms2-0.8-r2.ebuild => xmms2-0.8-r3.ebuild}   | 45 ++++++++++------------
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
new file mode 100644
index 0000000..937f3d7
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
@@ -0,0 +1,30 @@
+commit 86ea5e2d2ac2d8c8c1aee484e8c264440fafcb6a
+Author: Daniel P. Chokola <dan.chokola@×××××.com>
+Date:   Wed Jan 1 14:57:35 2014 -0500
+
+    BUG(2573): Samba 4.0 uses pkg-config. Find libsmbclient.h properly.
+
+diff --git a/src/plugins/samba/wscript b/src/plugins/samba/wscript
+index 8398169..77d7cda 100644
+--- a/src/plugins/samba/wscript
++++ b/src/plugins/samba/wscript
+@@ -1,8 +1,17 @@
+ from waftools.plugin import plugin
++from waflib import Errors
+ 
+ def plugin_configure(conf):
+-    conf.check_cc(header_name="libsmbclient.h")
+-    conf.check(lib="smbclient", uselib_store="smbclient")
++    try:
++        conf.check_cfg(package="smbclient", uselib_store="smbclient",
++                       args="--cflags --libs")
++    except Errors.ConfigurationError:
++        conf.check_cc(header_name="libsmbclient.h",
++                      uselib="smbclient",
++                      type="cshlib")
++        conf.check(lib="smbclient", uselib_store="smbclient",
++                   uselib="smbclient",
++                   type="cshlib")
+ 
+ configure, build = plugin("samba", configure=plugin_configure,
+         libs=["smbclient"])

diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index 515550e..c0a1811 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -125,6 +125,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-audio4-p6.patch
 	epatch "${FILESDIR}/${P}"-audio4-p7.patch
 	epatch "${FILESDIR}/${P}"-rtvg.patch #424377
+	epatch "${FILESDIR}/${P}"-samba-4.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die

diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r3.ebuild
similarity index 92%
copy from media-sound/xmms2/xmms2-0.8-r2.ebuild
copy to media-sound/xmms2/xmms2-0.8-r3.ebuild
index 515550e..c910ef3 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r3.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=5
 
-inherit eutils python toolchain-funcs
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-any-r1 ruby-single toolchain-funcs
 
 MY_P="${P}DrO_o"
 
@@ -14,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
 IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss
@@ -25,7 +28,7 @@ RDEPEND="server? (
 		>=dev-db/sqlite-3.3.4
 
 		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl )
+		airplay? ( dev-libs/openssl:0= )
 		alsa? ( media-libs/alsa-lib )
 		ao? ( media-libs/libao )
 		avahi? ( net-dns/avahi[mdnsresponder-compat] )
@@ -49,14 +52,14 @@ RDEPEND="server? (
 		musepack? ( media-sound/musepack-tools )
 		ofa? ( media-libs/libofa )
 		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( net-fs/samba[smbclient] )
+		samba? ( net-fs/samba[smbclient(+)] )
 		sid? ( media-sound/sidplay
 			media-libs/resid )
 		sndfile? ( media-libs/libsndfile )
 		speex? ( media-libs/speex
 			media-libs/libogg )
 		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw media-libs/libsamplerate )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
 		wavpack? ( media-sound/wavpack )
 		xml? ( dev-libs/libxml2 )
 	)
@@ -64,18 +67,20 @@ RDEPEND="server? (
 	>=dev-libs/glib-2.12.9
 	cxx? ( >=dev-libs/boost-1.32 )
 	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.5 ) "
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
 
 DEPEND="${RDEPEND}
 	dev-lang/python
-	python? ( dev-python/pyrex )
+	virtual/pkgconfig
 	perl? ( dev-perl/Module-Build
 		virtual/perl-Module-Metadata )
-	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
 	test? ( dev-util/cunit
 		valgrind? ( dev-util/valgrind ) )
-	"
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -100,10 +105,6 @@ xmms2_flag() {
 	esac
 }
 
-pkg_setup() {
-	python_pkg_setup
-}
-
 src_prepare() {
 	./waf # inflate waf
 	cd .waf* || die
@@ -125,10 +126,12 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-audio4-p6.patch
 	epatch "${FILESDIR}/${P}"-audio4-p7.patch
 	epatch "${FILESDIR}/${P}"-rtvg.patch #424377
+	epatch "${FILESDIR}/${P}"-samba-4.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die
 	fi
+	epatch_user
 }
 
 src_configure() {
@@ -267,9 +270,7 @@ src_test() {
 
 src_install() {
 	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO README
-
-	use python && python_need_rebuild
+	dodoc AUTHORS TODO
 }
 
 pkg_postinst() {
@@ -283,10 +284,4 @@ pkg_postinst() {
 		einfo "developers which may help finding bugs"
 		einfo "Disable the phonehome useflag if you don't like that"
 	fi
-
-	use python && python_mod_optimize xmmsclient
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup xmmsclient
 }