Convert to python-single-r1 & multilib.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 138 insertions, 12 deletions

diff --git a/media-sound/lash/ChangeLog b/media-sound/lash/ChangeLog
index 7efadc73115a..a10747c0afb4 100644
--- a/media-sound/lash/ChangeLog
+++ b/media-sound/lash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.39 2013/02/25 08:04:11 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.40 2014/05/03 08:27:56 mgorny Exp $
+
+*lash-0.5.4-r2 (03 May 2014)
+
+  03 May 2014; Michał Górny <mgorny@gentoo.org> +lash-0.5.4-r2.ebuild:
+  Convert to python-single-r1 & multilib.
 
   25 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> lash-0.5.4-r1.ebuild,
   +files/lash-0.5.4-gcc47.patch:
@@ -140,4 +145,3 @@
   and connects different kinds of virtual audio ports together (currently JACK
   and ALSA sequencer ports). It can also be used to move entire sessions
   between computers, or post sessions on the Internet for download.
-
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 8521f257c291..0e4d9f6a8d1e 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -6,16 +6,25 @@ AUX lash-0.5.4-glibc2.8.patch 337 SHA256 f3ae3954e6754b9d2fc43773fb1472f5e64c581
 AUX lash-0.5.4-swig_version_comparison.patch 1124 SHA256 519eef6c47dfc411a6fa54bb2dbb83ca023a4850dcf944504e2f424c954ebfd8 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890 WHIRLPOOL 9ebe9c29b013082ee236ed9a1d5172fcfb45ee0b7cce734baa343443f392bab010ef636daf5cee2f5c8ca52fb3d025253df1f031e9f8c0c445fc276667dd65c1
 DIST lash-0.5.4.tar.gz 623469 SHA256 105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c WHIRLPOOL 404cf85b8a2e4a17b32f9c43f78ac088864ce8de7777cec30261d614d3753922985492bc0862a6b0fa18e9e2fc962696954850c4d47034bbfa54e7c5ef1fdb6b
 EBUILD lash-0.5.4-r1.ebuild 1863 SHA256 be5612382ed786e993029528e6df587973d7f695a96d0c9a4c5e16d79880b04d SHA512 ca5c1ca0635b887ee4d911a4dc974a6820da288870853c9cf32237a559d7082fcfb787233e4dec2364fd0ec85d92f8aae52a8dc6e5ce66753aff8375ac7302a2 WHIRLPOOL 9848c92ff92db15436c7e886b7a0396354b85e4648a935671e2ec9d5230c6fcb05c5f6fb6aba79c4bf064cf8a1c2f855d4435bf9ee61a8c06542107bee339e71
-MISC ChangeLog 5409 SHA256 29cd0599c26b8ee3005ca59897c377b636c931d65e25989f99d06e66ea87e106 SHA512 dde8e109986d15684a452034a5bdcd987e1accc959b4eb7d4dad7dd1e604f3053d7b12fc810daace16cbdd1208fd3b087f716213e7997142e70400f806548f30 WHIRLPOOL d2b6b23209c5c65b1a880c3a8c20e591cbdb13c2918bf42ee50c84e645171f7b5847e426afaabc91e8ba1fc0df4e97a61e81cb8d4034e4af49361aa80d3d11c7
+EBUILD lash-0.5.4-r2.ebuild 2655 SHA256 62569bb704f26b3ca51dec8b796c9ecca1fbaade90a27ae2fcb93349dc43fb0b SHA512 26b463a2be525b74d6c93b832f34cd0c9812dc736b614b00c563e33e44168e8a7049b641031a2fed387837db24eee067b74e565a3e9ba995a4e7a068e6afe0b1 WHIRLPOOL 315ad291505ec54d9f3d7f3e75d0c22be9c8218141f413052cc347969f66c2d62b59c887e7ad892e55afd8c0ca2a18384dfd00128a5afa914b1ae66dd9eb66f7
+MISC ChangeLog 5551 SHA256 1eeb02efb2692aba31dc99d0f1804f6f18d337cd17d44ab84b3607dfe9f73a5d SHA512 f7038fe2032f6a6034ef1b3735f27ec453ce6c37314a0370a1449d7a95c1f1c01acb4e03551d64dbb0f472428a6d68dc2f3aa5d92923ac679800ac9f6020f808 WHIRLPOOL 2597c7a7e9caf02fc11fa85b53e9c2fd1b02559fc41d2a76891c05befeea2f6fe47231863e52fe7e309b017b9861b3949a57a1d47f54fd8fec0b875650fec441
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRKxrBAAoJEEdUh39IaPFNqJ8IAJtfc6P/mA8Ak7T4cKYZ6zgO
-dnNK7i+/2nWek6lzJgMEFEx+D1gXpGC3+JVmX0cQgiZHbIc/FJXrhsK4uQM4naNb
-yYSlNlXFZ1V5S2NeYxQIK6B0fwklI1qDEHjXEAphGatX9z5DFCmhlhUiU1IQTZrX
-6N34V/7EU1KqIsLOjEOybUKvR4rNG5UkrKcAIH2RHIi7fdj2WSNK3kvhIaJ//wPM
-8Q4dHnydWvDVkSiiWoJujAT7Pi0cZTFdI3Sifu1W/ZTTxYhjOPAq11Yl95GfHwtx
-93gkmStBMxL1HfrYT77s+/ABx0gkcNY17az7+Zltmdj2Cp06AyXWH7lNKO6CWH4=
-=b6XP
+iQJ8BAEBCABmBQJTZKiOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3TwQAI+YasqTCMqC1Bwzc8ge2v4A
++M8CB3xfoTI9pmH090hE7vNAJ4esxgRg8RwWljpYg5lW0mvaAVSLQQbbSNrkjvcy
+9orHtN+MDQQv0d9ZQ+T5GQ3SQ0kWj46D2gxoeArTqRueaXbvBONU1o1P6hrqhSUW
+tY1qvlwxJMU7D4rClrmj48nU8nzGWO7PyPOEK3NqaPXQOs05t0WnwL4QDqoZdcnr
+Jm4Lek7zoATDlj99yIqaiNo47fwQeDWUBVy+MzK3jn/FIoJ9n+3piLf0noTxz961
+PYEzXsextdACda9xU5oJ12d2a2C0LUugLzpyGi6fIzu1w8xSD2J5tnMp3oySa0ky
+JkspCtHhmUq9mSjs2C4Dv1oko7fLQZPIkzhk9f80nuJkx6PjpDXnDwRpgsmniEVA
+oPC7U1wIvpiORqO4hqo8bJS1S47yzhfbB2G6i2NG/WarKmGtTR+LGe5pN3oAcgdy
+QxEk6rwqp2EpDiqLnAt8GH+QH4amokJ0FjzIA8d2PtnUqbx1lgMw+2f5DrgD/UH2
+ahPFlB2lrmiFyC6Wldij4bi0SAeIt66GaphY3d0TLEXIkjahFAWy0gaCvtcW++B0
+00EgJvVx4D/eAq2TPnCqC5JQMR+LsLH+AKOqPOcV4hcIz6O8LFlRzvHeauW7nQgN
+ms5+XE5LFNPAGffMUylk
+=3hjD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lash/lash-0.5.4-r2.ebuild b/media-sound/lash/lash-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..e98390fb5726
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r2.ebuild,v 1.1 2014/05/03 08:27:56 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+RDEPEND="dev-libs/libxml2
+	media-sound/jack-audio-connection-kit
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-1.3.40 )"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	epatch \
+		"${FILESDIR}"/${P}-glibc2.8.patch \
+		"${FILESDIR}"/${P}-swig_version_comparison.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+multilib_src_configure() {
+	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+	export ac_cv_prog_lash_texi2html=no #422045
+
+	# --enable-pylash would disable it
+	local myconf=()
+	if ! multilib_is_native_abi || ! use python; then
+		myconf+=( --disable-pylash )
+	fi
+
+	if ! multilib_is_native_abi; then
+		# disable remaining configure checks
+		myconf+=(
+			JACK_CFLAGS=' '
+			JACK_LIBS=' '
+			XML2_CFLAGS=' '
+			XML2_LIBS=' '
+
+			vl_cv_lib_readline=no
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable alsa alsa-midi) \
+		$(multilib_native_use_enable gtk gtk2) \
+		$(multilib_native_use_enable debug) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C liblash
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		# headers
+		emake -C lash DESTDIR="${D}" install
+		# library
+		emake -C liblash DESTDIR="${D}" install
+		# pkg-config
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	dohtml docs/lash-manual-html-*/lash-manual.html
+	prune_libtool_files --all # --all for _lash.la in python directory
+	use python && python_optimize
+}