media-sound/mp3splt-gtk: 0.7.0.930

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/media-sound/mp3splt-gtk/ChangeLog b/media-sound/mp3splt-gtk/ChangeLog
index fc039501dd319066fb9fea386cf798e507f7c9d5..85639f974b8662f72dfcd15cd45e5323b4cafa24 100644 (file)
--- a/media-sound/mp3splt-gtk/ChangeLog
+++ b/media-sound/mp3splt-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp3splt-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.21 2011/09/06 22:34:39 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.22 2011/09/23 21:26:49 sping Exp $
+
+*mp3splt-gtk-0.7.0.930 (23 Sep 2011)
+
+  23 Sep 2011; Sebastian Pipping <sping@gentoo.org>
+  +mp3splt-gtk-0.7.0.930.ebuild, +files/mp3splt-gtk-0.7.0.930-gtk.patch,
+  metadata.xml:
+  Bump to latest snapshot for support of both Audacious/GTK 2.x/3.x
 
 *mp3splt-gtk-0.7.0.920 (06 Sep 2011)
 

diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index c1cf8729e903fe7a122b1ed13a985c98f674aa7e..ac71793ddd1d8c5684c7151e4cb8bf797bd80b88 100644 (file)
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX mp3splt-gtk-0.7-disable-docs.patch 1437 RMD160 d4289b18f24e7a7abe18e08af3f2dbbac8fd1d60 SHA1 27f5a60995866b6354c19b4b97ccfaacf28ccf3b SHA256 18b04f85044e1adc5466fb5965e63b4ea7593eb0c0686ce725558bf1de4705d6
+AUX mp3splt-gtk-0.7.0.930-gtk.patch 1413 RMD160 a383dc7ab0dabc7a73586a08af1bc62be75507c5 SHA1 a98c06ba6816ab872485c9fb427fced1664b85a9 SHA256 bc8cebdeabdc06a6bab7c95bd0ab929504401bbb04ddc912ddbe7c304d90ff6b
 DIST mp3splt-gtk-0.5.9.tar.gz 304691 RMD160 4f2316ef03ab3bfc57a63af3b47cbe0a015bfd15 SHA1 b8d002b8714ce9f0c21c830613b6bb2737eb6837 SHA256 6742caf7f79246d1b06d2dd9fb53c9d7d9df97508dcd6dc716e6f679ef2905b3
 DIST mp3splt-gtk-0.7.0.920.tar.gz 854263 RMD160 7f5fc4af5dcfab95ee9e03473e690f4f278e8a9d SHA1 ffd82fb634b211c5a6f2641b31a7593b4de7f4a8 SHA256 16b7cec7bd2375db89b4ad0b463ec6dcefbd33c434b411de138ade7812f12ee2
+DIST mp3splt-gtk-0.7.0.930.tar.gz 856532 RMD160 9c05bb2f24365e06ad5ff5f9b8cc07a730a20802 SHA1 0497ad415c5d1513cc3995bf9a8c98da7632565f SHA256 5c242b0141798f565e95b67e88ba317ad8190249a1c362ad1cb3625d98e01d31
 DIST mp3splt-gtk-0.7.tar.gz 849473 RMD160 34af2506fca171b2c8650b931a508751a2cb1e2f SHA1 06b0d86342a24426905ce355e3fcc417249ec4ee SHA256 67046b0ab119907e8614089d42f180bdca034e758e24e2d078308e4d26fe8fd0
 EBUILD mp3splt-gtk-0.5.9.ebuild 1303 RMD160 5bfa4551a55bd5cd8a5ec2132b73c066c95f7e14 SHA1 afba21233ef1f407d91f2d1f23cbb1756b16d734 SHA256 2960c769dd42ca0ff705acff6f239be729727967f1fa2875e4cb1e33229eb5f8
 EBUILD mp3splt-gtk-0.7.0.920.ebuild 1598 RMD160 34ae935822f38da5f28c1299def6d8182728834b SHA1 4362532356cc7bb6e26053acb1d3cf541263b18d SHA256 8b786087110ebac245eab26dc892ec668eb631e582d89ac2d697602113b8134c
+EBUILD mp3splt-gtk-0.7.0.930.ebuild 1683 RMD160 06b3bf74723a4e2ed18c0b9ca899759538a79d64 SHA1 cdf17dd3c9eb67dd9461a7166cfb2a955ed443c9 SHA256 a9178f2cdecaa8c553807e10d7d21d4acef0ef3d803d35e98d976482d31d7610
 EBUILD mp3splt-gtk-0.7.ebuild 1532 RMD160 fe4dc4f212b690ec7d8c6df848a91750b4b374cd SHA1 3401e23b4a84256f44e8c316208c2d7604fca799 SHA256 3329748754cf5f4d0f80ef674efdaaf877f7b76abb7ebb649fcef3451bab974f
-MISC ChangeLog 3069 RMD160 b675cc9e9d1b69e8d8b6f013bf7f6cc9593ef5fd SHA1 279884ba0dde97af6c8964a0b8e910e4dcaf51cf SHA256 f6a5f1bdc6e32d0326a3ae1cf905825de20e56bed6708a48d3b12b3b64c894bd
-MISC metadata.xml 351 RMD160 61bf6f5b6db674bc46e0d742e691352f92d0b568 SHA1 7dc16a5a7e39cb0fc47f7d6cc668bb22d6e1dbbd SHA256 69016600dde410b32abb84f667375859110fc0e97020cb207e9cd5a77a37627b
+MISC ChangeLog 3317 RMD160 b6d1bf2faa9b58c4c4c0e9ce8f68d2bcb9ba314a SHA1 d81dfc4efb9c04415db16cb3431cd67ec4b35385 SHA256 fc7c6ba4efecf79e15b39487da512325a282a20f50f0efe86f43c28398f28158
+MISC metadata.xml 456 RMD160 8ff8ce2874dac3d4c4311f66d0b09bf07c85423c SHA1 667769978970b7ec6a6ebd6bbb3f5183f54323c3 SHA256 9f9f9850d89bbf3730cc288e9c0dda30e23a2fb79aed5ac69d2f9e1a7ff055cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5mn/4ACgkQsAvGakAaFgBZ+wCdFwNz8JS2xevA5btK9+HUCI7r
-asQAn2qG32kFcmhKcIZ49TA2KOps+Mu1
-=fUSV
+iEYEARECAAYFAk58+ZoACgkQsAvGakAaFgBz5wCcDcDXxxfdX/pSjq9ekOZnpgF1
+KV0AmgPaMbP1D31stWly+uWW4I1B6/V3
+=UC7j
 -----END PGP SIGNATURE-----

diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch
new file mode 100644 (file)
index 0000000..bb4b2f7
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch
@@ -0,0 +1,44 @@
+From bb1c3cb3ffd1081d56e48d87ab05d31ad05d89de Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 23 Sep 2011 23:09:47 +0200
+Subject: [PATCH] Allow specifying a specific slot of GTK
+
+---
+ configure.ac |   18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2157019..fbcadcf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,14 +150,22 @@ fi
+ 
+ #################################################
+ #Check for GTK
+-ifdef([AM_PATH_GTK_3_0],
+-[
++AC_ARG_ENABLE(gtk3, [
++AC_HELP_STRING([--enable-gtk3],  [Compile against GTK 3.x explicitly (default: use GTK 3.x if available)])
++AC_HELP_STRING([--disable-gtk3], [Compile against GTK 2.x explicitly (default: use GTK 3.x if available)])],
++    [enable_gtk3=$enableval],[enable_gtk3="auto"])
++
++if test "x$enable_gtk3" = xauto; then
++  AC_MSG_NOTICE([selecting GTK 2.x/3.x automatically])
++  ifdef([AM_PATH_GTK_3_0],[enable_gtk3=yes],[enable_gtk3=no])
++fi
++
++if test "x$enable_gtk3" = xyes; then
+   CFLAGS="$CFLAGS -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+   AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(mp3splt-gtk needs GTK+ >= 3.0.0))
+-],
+-[
++else
+   AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(mp3splt-gtk needs GTK+ >= 2.20.0))
+-])
++fi
+ 
+ #################################################
+ #Check for libmp3splt
+-- 
+1.7.6.1
+

diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index 5bcaaae7782be82f9973d891eb5ba43b02dbce09..173b15a3e98873d78305434daccf4584009dad4f 100644 (file)
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -8,5 +8,6 @@
        </maintainer>
        <use>
                <flag name='audacious'>Include <pkg>media-sound/audacious</pkg> support</flag>
+               <flag name='gtk3'>Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
        </use>
 </pkgmetadata>

diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.0.930.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.0.930.ebuild
new file mode 100644 (file)
index 0000000..e9a75d9
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.0.930.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.0.930.ebuild,v 1.1 2011/09/23 21:26:49 sping Exp $
+
+EAPI=2
+inherit versionator autotools multilib
+
+DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding."
+HOMEPAGE="http://mp3splt.sourceforge.net"
+SRC_URI="http://ioalex.net/testing_downloads/snapshots/$(get_version_component_range 4)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious doc gtk3 gnome gstreamer nls"
+
+RDEPEND=">=media-libs/libmp3splt-0.7.0.920
+       gtk3? ( x11-libs/gtk+:3
+               audacious? ( >=media-sound/audacious-3.0 ) )
+       !gtk3? ( >=x11-libs/gtk+-2.6:2
+               audacious? ( <media-sound/audacious-3.0 ) )
+       gstreamer? ( media-libs/gst-plugins-base:0.10 )
+       gnome? ( gnome-base/libgnomeui )"
+DEPEND="${RDEPEND}
+       gnome? ( app-text/gnome-doc-utils app-text/rarian )
+       nls? ( sys-devel/gettext )"
+
+src_prepare() {
+       if use audacious; then
+               sed -i \
+                       -e 's:@AUDACIOUS_LIBS@:-laudclient &:' \
+                       src/Makefile.am || die
+       fi
+
+       epatch "${FILESDIR}"/${P}-gtk.patch
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       use nls || myconf+=" --disable-nls"
+       use audacious || myconf+=" --disable-audacious"
+       use gstreamer || myconf+=" --disable-gstreamer"
+
+       econf \
+               --disable-dependency-tracking \
+               --with-mp3splt-libraries=/usr/$(get_libdir) \
+               --with-mp3splt-includes=/usr/include/libmp3splt \
+               $(use_enable gnome) \
+               $(use_enable doc doxygen_doc) \
+               $(use_enable gtk3) \
+               ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS README
+}