| [proaudio] [2094] media-sound/jack-mixer update, thanks to Ede & Nedko |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2094
Author: gavlee
Date: 2012-02-08 21:56:24 +0100 (Wed, 08 Feb 2012)
Log Message:
-----------
media-sound/jack-mixer update, thanks to Ede & Nedko
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/jack_mixer/ChangeLog
trunk/overlays/proaudio/media-sound/jack_mixer/Manifest
trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9999.ebuild
trunk/overlays/proaudio/media-sound/jack_mixer/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/jack_mixer/files/missing-gconf-2.m4.patch
trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9-r1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-8.ebuild
Modified: trunk/overlays/proaudio/media-sound/jack_mixer/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/ChangeLog 2012-01-28 22:46:50 UTC (rev 2093)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/ChangeLog 2012-02-08 20:56:24 UTC (rev 2094)
@@ -1,7 +1,17 @@
# ChangeLog for media-sound/jack_mixer
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jack_mixer-9-r1 (08 Feb 2012)
+
+ 08 Feb 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+ +files/missing-gconf-2.m4.patch, -jack_mixer-8.ebuild,
+ +jack_mixer-9-r1.ebuild, jack_mixer-9999.ebuild, metadata.xml:
+ add patch to fix live ebuild without gconf. bump to EAPI=3. utilise
+ python.eclass. add gconf USE flag. tidy up ebuild a bit wrt deps.
+ remove older ebuild as repoman payment.
+ Thanks to Ede Wolf and Nedko Arnaudov
+
05 Jul 2011; Hakan Demiralp <keenblade@xxxxxxxxxxxxx jack_mixer-9.ebuild:
jack_mixer-9: gnome-python is now USE-Conditional Dependency
Modified: trunk/overlays/proaudio/media-sound/jack_mixer/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/Manifest 2012-01-28 22:46:50 UTC (rev 2093)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/Manifest 2012-02-08 20:56:24 UTC (rev 2094)
@@ -1,8 +1,8 @@
AUX empty_name_on_rename.patch 1795 RMD160 0cd4234e1091d4f16e1069a75ffbc47dfc8fbcf1 SHA1 83cd22ea18893d5595ab1a438f7a9c67e9010ee7 SHA256 caa18dee37e68ff8fcea1f8571fa39628eee941e3ac81f42482a0539c59be7ca
-DIST jack_mixer-8.tar.gz 380897 RMD160 c6003f9e4ee33daad3ac1b48425bf130801c666f SHA1 b031ade323a6835d57cc69d108edc76b9aa2a09d SHA256 47f451b7ca730bc81f9becf87d6d3b981c2333101f3808c8e30e809bdd1e9826
+AUX missing-gconf-2.m4.patch 1744 RMD160 042e39c55338fb24a17e88de7e61c799bba95ccc SHA1 2f3abc3bb60d8b24d68a5e42d3b3049c6a6add90 SHA256 e2d42a08cd3c90f6febcd90bb4760aeb39f625b7d550223cbee798e165cdde11
DIST jack_mixer-9.tar.gz 381557 RMD160 f4e9354afc685769dc230da1cc777953ba428615 SHA1 2ea6bb2ffda7ab65d9105165a3df64e5dae67179 SHA256 7683b637368bf515031c362c1a698edfaf390f1b3ba0f5211fe3277a496520f7
-EBUILD jack_mixer-8.ebuild 928 RMD160 56d15e582ad2956053e1daec343a7ffc404f779b SHA1 546f79aabe6ee87164ab7ed525f78031b40a8522 SHA256 aea5f6c7b604dae3a97babc37da98fc4af1d3020058a1ebb8e2c8abd02f28692
+EBUILD jack_mixer-9-r1.ebuild 1169 RMD160 7e3b2eda7eee6ac38efba54bb781f731b935d3ae SHA1 668705de35f6bbda8329543e536a23e33deebb51 SHA256 58dda5cb87caf38cd0db65a693c5a386bdb5c53cb406986760274bbe2f0adf6c
EBUILD jack_mixer-9.ebuild 952 RMD160 0adf8db41649a104be39d08feb96a0dc7ff9bb56 SHA1 0e9824384aea23fade6a0e577d080d3b6b2d8b7b SHA256 e1fe86a291df85e2254730ade3b62a2b0f2ef1a63e7fe333ad30b748c0f26024
-EBUILD jack_mixer-9999.ebuild 979 RMD160 cabdee19f9613de46c237fab281e36959ecc276e SHA1 53e666d1ed4b32c4b52b1d7f97380514c0b77929 SHA256 dc455e5e165b7e8ceaa28ef491277cf23bcde813b9e9c4e357dce21f8630c960
-MISC ChangeLog 1028 RMD160 197fb10a383ac1e5553fcfd3903738e4f8ffc0dd SHA1 6772b03f22395d158700fa59969630ecc4737ea4 SHA256 664a2d764571baa2c9555d29303955bbd9e436021634b6cd5a00b33949b2d4df
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD jack_mixer-9999.ebuild 1202 RMD160 66b9fff2bf60d09f68b3919a72453eb0ab158f11 SHA1 ad754783ed41db614df140d9937a2250dee16d6e SHA256 2ce2512555183598e75945fddde8d72653c0ec9172958003c3d1adb5d0a42be9
+MISC ChangeLog 1459 RMD160 dc6a8fc84044796c3cda9c8904e86a1ecabf3844 SHA1 83a0396247c8e00facca1350a22c5646717334d7 SHA256 14b53ac8914b26af0fd5ca9aaf15eaceced4f1e8e10587d85bd2cd14dc9fa88b
+MISC metadata.xml 561 RMD160 196508087224de9914a4d23e190b0b95bb51a3b8 SHA1 01e5f28abc09da7c945868fac210ca53465660e3 SHA256 d062b3aecf54ffd486efda6097db54787c3435ee03d38d658ff03f491d8a2f3a
Added: trunk/overlays/proaudio/media-sound/jack_mixer/files/missing-gconf-2.m4.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/files/missing-gconf-2.m4.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/files/missing-gconf-2.m4.patch 2012-02-08 20:56:24 UTC (rev 2094)
@@ -0,0 +1,47 @@
+--- /dev/null 2012-01-23 08:34:19.439030690 +0000
++++ m4/gconf-2.m4 2011-11-07 14:11:06.000000000 +0000
+@@ -0,0 +1,44 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
Deleted: trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-8.ebuild 2012-01-28 22:46:50 UTC (rev 2093)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-8.ebuild 2012-02-08 20:56:24 UTC (rev 2094)
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils gnome2
-
-IUSE="lash phat"
-RESTRICT="mirror"
-
-DESCRIPTION="JACK audio mixer using GTK2 interface."
-HOMEPAGE="http://home.gna.org/jackmixer/";
-SRC_URI="http://download.gna.org/jackmixer/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Not sure about the required swig version, report if 1.3.25 doesn't work
-DEPEND="media-sound/jack-audio-connection-kit
- dev-python/pygtk
- dev-python/fpconst
- >=dev-python/pyxml-0.8.4
- dev-python/gnome-python
- media-libs/pyphat"
- # 1. only needed for non tarballs aka svn checkouts >=dev-lang/swig-1.3.25
-RDEPEND="${DEPEND}
- phat? ( media-libs/pyphat )
- lash? ( || ( media-sound/lash[python] >=media-libs/pylash-3_pre ) )"
-
-src_install() {
- gnome2_src_install
- dosym /usr/bin/jack_mixer.py /usr/bin/jack_mixer
- dodoc AUTHORS NEWS README
-}
Added: trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9-r1.ebuild 2012-02-08 20:56:24 UTC (rev 2094)
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND="2:2.4"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit eutils gnome2 python
+
+DESCRIPTION="JACK audio mixer using GTK2 interface."
+HOMEPAGE="http://home.gna.org/jackmixer/";
+SRC_URI="http://download.gna.org/jackmixer/${P}.tar.gz";
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf lash phat"
+
+DEPEND="dev-python/fpconst
+ dev-python/pygtk
+ >=dev-python/pyxml-0.8.4
+ media-sound/jack-audio-connection-kit"
+RDEPEND="${DEPEND}
+ gconf? ( dev-python/gconf-python:2 )
+ lash? ( || (
+ media-sound/lash[python]
+ >=media-libs/pylash-3_pre
+ )
+ )
+ phat? ( media-libs/pyphat )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/empty_name_on_rename.patch"
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ dosym /usr/bin/jack_mixer.py /usr/bin/jack_mixer
+ dodoc AUTHORS NEWS README
+}
+
+pkg_postinst() {
+ python_mod_optimize "${EPREFIX}/usr/share/${PN}"
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ python_mod_cleanup "${EPREFIX}/usr/share/${PN}"
+ gnome2_pkg_postrm
+}
Modified: trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9999.ebuild 2012-01-28 22:46:50 UTC (rev 2093)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9999.ebuild 2012-02-08 20:56:24 UTC (rev 2094)
@@ -1,39 +1,45 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=3
+PYTHON_DEPEND="2:2.4"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit eutils gnome2 python git-2 autotools
-inherit eutils git gnome2
-
-IUSE="lash phat"
-RESTRICT="mirror"
-
DESCRIPTION="JACK audio mixer using GTK2 interface."
HOMEPAGE="http://home.gna.org/jackmixer/";
EGIT_REPO_URI="git://repo.or.cz/jack_mixer.git"
SRC_URI=""
+RESTRICT="mirror"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
+IUSE="gconf lash phat"
-# Not sure about the required swig version, report if 1.3.25 doesn't work
-DEPEND="media-sound/jack-audio-connection-kit
+DEPEND="dev-python/fpconst
dev-python/pygtk
- dev-python/fpconst
- >=dev-python/pyxml-0.8.4"
- # 1. only needed for non tarballs aka svn checkouts >=dev-lang/swig-1.3.25
+ >=dev-python/pyxml-0.8.4
+ media-sound/jack-audio-connection-kit"
RDEPEND="${DEPEND}
- phat? ( media-libs/pyphat )
- lash? ( || ( media-sound/lash[python] >=media-libs/pylash-3_pre ) )"
+ gconf? ( dev-python/gconf-python:2 )
+ lash? ( || (
+ media-sound/lash[python]
+ >=media-libs/pylash-3_pre
+ )
+ )
+ phat? ( media-libs/pyphat )"
-src_unpack() {
- git_src_unpack
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
}
src_prepare() {
- "${S}/autogen.sh" || die
+ epatch "${FILESDIR}"/missing-gconf-2.m4.patch
+ AT_M4DIR="m4" eautoreconf
gnome2_src_prepare
}
@@ -42,3 +48,13 @@
dosym /usr/bin/jack_mixer.py /usr/bin/jack_mixer
dodoc AUTHORS NEWS README
}
+
+pkg_postinst() {
+ python_mod_optimize "${EPREFIX}/usr/share/${PN}"
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ python_mod_cleanup "${EPREFIX}/usr/share/${PN}"
+ gnome2_pkg_postrm
+}
Modified: trunk/overlays/proaudio/media-sound/jack_mixer/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/metadata.xml 2012-01-28 22:46:50 UTC (rev 2093)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/metadata.xml 2012-02-08 20:56:24 UTC (rev 2094)
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>
+ <use>
+ <flag name="gconf">Use <pkg>dev-python/gconf-python</pkg> to store preferences with gconf</flag>
+ <flag name="lash">Enable LASH Audio Session Handler support with <pkg>media-libs/pylash</pkg></flag>
+ <flag name="phat">Use fanslider widget for pan/balance from <pkg>media-libs/pyphat</pkg></flag>
+ </use>
</pkgmetadata>