| [proaudio] [2811] media-sound/laditools: introduce small wmladi hack, thanks to Zlobin Nikita for the report. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2811
Author: lilrc
Date: 2013-12-01 13:38:07 +0100 (Sun, 01 Dec 2013)
Log Message:
-----------
media-sound/laditools: introduce small wmladi hack, thanks to Zlobin Nikita for the report. Remove old ebuilds, update DESCRIPTION and HOMEPAGE, PYTHON_REQUIRED_USE, slotted dependencies, alphabetical ordering
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/laditools/ChangeLog
trunk/overlays/proaudio/media-sound/laditools/Manifest
trunk/overlays/proaudio/media-sound/laditools/laditools-9999-r1.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r3.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r1.ebuild
trunk/overlays/proaudio/media-sound/laditools/laditools-9999.ebuild
Modified: trunk/overlays/proaudio/media-sound/laditools/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/ChangeLog 2013-11-29 21:52:18 UTC (rev 2810)
+++ trunk/overlays/proaudio/media-sound/laditools/ChangeLog 2013-12-01 12:38:07 UTC (rev 2811)
@@ -2,6 +2,19 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*laditools-1.0.1-r3 (01 Dec 2013)
+
+ 01 Dec 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ -laditools-1.0.1-r1.ebuild, +laditools-1.0.1-r3.ebuild,
+ -laditools-9999.ebuild, laditools-9999-r1.ebuild:
+ Introduce a small hack to remove wmladi no matter how the python
+ wrappings work. Thanks to Zlobin Nikita for reporting the issue.
+ Removed old ebuilds.
+ Update DESCRIPTION and HOMEPAGE.
+ PYTHON_REQUIRED_USE in REQUIRED_USE.
+ Use slots for more accurate dependencies.
+ Some ordering (alphabetically).
+
31 Jul 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
-laditools-1.0.ebuild, -laditools-1.0_rc1.ebuild:
Removed very old ebuilds.
Modified: trunk/overlays/proaudio/media-sound/laditools/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/Manifest 2013-11-29 21:52:18 UTC (rev 2810)
+++ trunk/overlays/proaudio/media-sound/laditools/Manifest 2013-12-01 12:38:07 UTC (rev 2811)
@@ -2,10 +2,9 @@
AUX laditools-1.0_rc8-rsvg.patch 875 SHA256 490a32e8b0380cad6664703e6ba5644d04d46f532a3b0d67bbcceffeabbb279f SHA512 1589eec846f2e4565bf0c713f81b87a171d2e1180ac71a9d7cd4e9fb3eba5af1248363ed2ed3fa3b85a509c4ba1ed5986f34d7df32797fa0a288b73d35767eb1 WHIRLPOOL 8421eb25b55fa1624f29c005abc06e9ca32adce67170f714aaecd684963e18228b94186788c033fcac779e4472cc895f8c73f03445fc576d50f515242b06a6a0
DIST laditools-1.0.1.tar.gz 65264 SHA256 f0edd1ff45514dce2206ba01a43b362155787231046456367e48f9bc10d2c1e1 SHA512 d40c361373be55ee448395712e3f0d79b844029e110d6d4c8eb51fb3d47c9d2d45ec04e6e551f7dd656872d22d322cd5969bfe57ac9a94663b566573e40d7a8b WHIRLPOOL e4caf31bb9456d5c34c09c9a15f63da991ff75beeb5d67f936d41443b48724878ea08b7b295675f95705595629bea72093ee079fff0bcceab74e721ef7266a3f
DIST laditools-1.0~rc8.tar.gz 59791 SHA256 7b1bd034d1b51d00af8919b0bc2c4bbd8a817d3d08b77b4dc8dc160a14213c45 SHA512 9dc4cd5e7e04b1dfc924c213448be0ae360469c3df19736bf0773fe9c47f0fa777cf7013fa46279244cd95541ff9b9c0f108756ac02a2ccec8c788169917beeb WHIRLPOOL a1b95a06d4bc7cdb74f18f11f63dcf267deba3a4875b198d16aa22928602376d37214bbc2e46d471a85fb7201bd14edee6c30844f466697efad6cbae09952f91
-EBUILD laditools-1.0.1-r1.ebuild 1023 SHA256 fc70a9845865ae1a9a66dfc005c8c98c2a10779fee708b1f58bef644fc314607 SHA512 2b2ced0f35a741ea604b767a1dfe227b1dfe0393076cb16b71d658d23e47c4ea1aeabde2beaf2ea1a03f8274d69e3145e58b50800ffd8b152dd71de1b0572010 WHIRLPOOL d1443896ec6411ac80737c7ad3285ecae9d4e93f54d67389e39b34cc42acf3416c7980ef0a7be2a7d687d376d7389f5b2ddfc6d5b9ec305720372dc73813794f
EBUILD laditools-1.0.1-r2.ebuild 1115 SHA256 fcc59855650d8c53dc824f3935a54a1b536602abde36977188928f91eca49df4 SHA512 dd76afadac39e594e995253f5fda8b0af7ec117f85518ee60dd192d143edaddca7b734cf00f4b0bad12c02e3ec12e467228f14db3201697d695113c851b24eb2 WHIRLPOOL 3090eb0cabce24c00374ec119abeabc6bf23872e89ddb8815c4b83f4b767bb76fb684ab2b01112e25956a924ee5b110830611a8c3e02e3eba30c8058401a10d0
+EBUILD laditools-1.0.1-r3.ebuild 1302 SHA256 5b3bb12eaa182f2c45bdb3a3410bfa115f35fe121a63e3ceaa77e48cdf8879e5 SHA512 fb2ba6df751b8393d085d026713f316c745cfe1b2195f611546c01263e49436821e4965ddd0f8c79280a6f9f7e1c45449e60f17cce1defab878028760982dda3 WHIRLPOOL daf369073bbbda7f6e46457096ba54445204c46c72c5b95abdd6b9dc790310ed775837b20eff602502a67afc1241dcaeb30689cebea0c3c54b536d95c09f5bb1
EBUILD laditools-1.0_rc8.ebuild 941 SHA256 3fe8c62b97e3ef21043303b455370af1fe239edd7a560285aa382a90609682b7 SHA512 e41d3b6d460a250baddece730b9d72acf52bae23d56531531f115b75c182cfc9e522a0aaa33ded0d2b5967f9710aaf58a7a41a1d20e31dd19da35c53c49b7893 WHIRLPOOL c2ffea4c0131b5ce5e73db2b9c90a782f2df3371f9c65910e1fddb362bff670b9d7fcfc31e72756ef24dbfa9add8f6fd615cb00ca07ca8c094fb55eb09374ffa
-EBUILD laditools-9999-r1.ebuild 1016 SHA256 3f34392ee33c76dd4ccda431578bed306adce711ec0a25193534ac714b963829 SHA512 a9d818cfda71a3bf3731b01df3fc0811e2ad07299f2d7f8b155f433766951dc00298113b6091f104f857e6043929d09b841b9def4b92be3d4437b89035c7a5e8 WHIRLPOOL d86b1827634f51f7bb06439263e80d2048d86cba32f8a55191ab8580f3d14795f02531f931684aed34b87dbf03a78614246a52c31971f15350ce9ab7af0e3d30
-EBUILD laditools-9999.ebuild 917 SHA256 c4fdbdde5b78808268071e303442343dd386187db605a7603105e2c6202082c0 SHA512 4e4631e4fe6b33c46b79c152fcb9200349379bf27d689644c8ea4f8b41720f014ae90bcb3759dff105539188e7b9ead861c8f9408c71bd9d9f3ca083bdfa9231 WHIRLPOOL 9371701260432c9fa8065de190d69d5b61930b6fd87e5f9d7c7beaa64337586608563e08d71997e1a282d28669dde49ef6f47cade0117daf1ce9bfbde92b6a9a
-MISC ChangeLog 2074 SHA256 d9104b56a9af50953412dee67f3b522225b7d690adb07bbed96d21ca8988fad3 SHA512 4098040857684168758a326dd3fe9a864eb077ceadfb9d3520b1c739ed852e01f2b1a565996a9505c124f9de0f86d9652d6332e907217e78433bd3551ecd69e7 WHIRLPOOL ed19b63c4164caf115a7df0587eeef894398c55806ec54fc453753cd6ad975e9c32d69a05179342a53f9c10b621f5b185dba1ca73913ed7baca1b026c1e1ee1b
+EBUILD laditools-9999-r1.ebuild 1271 SHA256 1eb88683acdf4e35958c45d84f6144a443becd937b53d3555b196ec2952b1f17 SHA512 966ad3ce2b5b88c8a05ba38904d60d46c418ac9e058ef0d0d5ab3a548a7d9b152d5cad2200ca5ab487ac4133be0c7df364e966a2a95598df4bced3001a5b93cb WHIRLPOOL e85823f200363ba3db505f1153169f268fca3babcaa95ede659962e71ec4c5cf6ddbb255fc1721dfe1e6c8c438955d2da4da9616ee3d83ba8628d8c4f291c42e
+MISC ChangeLog 2595 SHA256 14b620b950352f5d7568bca982f4ef8a5f2c2481ae0df50c48634fbb0e6f6e9d SHA512 af1b0215936c2483a2df1e4f9c66f84cbcbdee193fead5c9b4218c5f0266e7c72cd88e769b3dac8aa0cccdcd85b333b411a84bff5facf57249aa554f79f50001 WHIRLPOOL d2d5369f19d92f7e682964ab09a4322ff7008388e8c4469c2593f2507e9ba1c6f8f41771583191f3b047b8f766ceae720db2f38a2d333454026f527ab83955ea
MISC metadata.xml 1499 SHA256 e177de6b4621c7209101caa71561308869c9202c05a93b140d5fe6a698488b3f SHA512 97ea49611d11b1f790a797979cfde3ec6b47d490a3b2fa34babb049075d9255939727f40ace3cbaad2964230c630b48b7e4a14dc3bc343282f5dfe9c3a08509a WHIRLPOOL 626792ca02c5e53d81c28d27b599b867306f7f14ef1c4e5c006d7eba76c1ab7c56bb80e73d89a42e1f5266130f4bf5466852cf8b776143d14e98c42ab4d1e46f
Deleted: trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r1.ebuild 2013-11-29 21:52:18 UTC (rev 2810)
+++ trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r1.ebuild 2013-12-01 12:38:07 UTC (rev 2811)
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT="python2_7"
-inherit eutils python-r1 distutils-r1
-
-DESCRIPTION="LADITools is a set of tools to improve desktop integration and user workflow of Linux audio systems"
-HOMEPAGE="http://www.marcochapeau.org/software/laditools";
-SRC_URI="https://launchpad.net/laditools/1.0/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wmaker"
-
-RDEPEND="dev-lang/python
- >=dev-python/pygtk-2.12
- dev-python/pyxdg
- >=dev-python/enum-0.4.4
- >=dev-python/pygobject-3.0.0
- dev-python/pyxml
- wmaker? ( dev-python/wmdocklib )
- >=x11-libs/gtk+-3.0.0[introspection]
- x11-libs/vte[introspection]
- >=media-sound/jack-audio-connection-kit-0.109.2-r2[dbus]"
-DEPEND="dev-python/python-distutils-extra"
-
-pkg_preinst() {
- if ! use wmaker ; then
- rm "${D}"/usr/bin/wmladi || die "rm wmladi failed"
- rm "${D}"/usr/bin/wmladi-python2.7 || die "rm wmladi-python2.7 failed"
- fi
-}
Copied: trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r3.ebuild (from rev 2810, trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r2.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r3.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/laditools/laditools-1.0.1-r3.ebuild 2013-12-01 12:38:07 UTC (rev 2811)
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="a set of tools to improve desktop integration and user workflow of Linux audio systems"
+HOMEPAGE="https://launchpad.net/laditools";
+SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wmaker"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ >=dev-python/enum-0.4.4[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+ dev-python/pyxml[${PYTHON_USEDEP}]
+ >=media-sound/jack-audio-connection-kit-0.109.2-r2[dbus]
+ >=x11-libs/gtk+-3.2.2:3[introspection]
+ >=x11-libs/vte-0.30.1:2.90[introspection]
+ wmaker? ( dev-python/wmdocklib[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+pkg_preinst() {
+ # A small hack to remove all wmladi files. This is needed because
+ # the ebuild should not rely on the python-r1 eclasses' internal
+ # wrappings.
+ if ! use wmaker ; then
+ local files=$(find "${D}" | grep wmladi)
+ for file in ${files}; do
+ einfo "Removing ${file} due to USE='-wmaker'"
+ rm ${file}
+ done
+ fi
+}
Modified: trunk/overlays/proaudio/media-sound/laditools/laditools-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/laditools-9999-r1.ebuild 2013-11-29 21:52:18 UTC (rev 2810)
+++ trunk/overlays/proaudio/media-sound/laditools/laditools-9999-r1.ebuild 2013-12-01 12:38:07 UTC (rev 2811)
@@ -6,9 +6,9 @@
PYTHON_COMPAT=( python2_7 )
-inherit git-2 distutils-r1
+inherit distutils-r1 git-2
-DESCRIPTION="Control and monitor a LADI system the easy way"
+DESCRIPTION="a set of tools to improve desktop integration and user workflow of Linux audio systems"
HOMEPAGE="https://launchpad.net/laditools";
EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
@@ -16,6 +16,7 @@
SLOT="0"
KEYWORDS=""
IUSE="wmaker"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
@@ -23,15 +24,21 @@
>=dev-python/enum-0.4.4[${PYTHON_USEDEP}]
>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
dev-python/pyxml[${PYTHON_USEDEP}]
- wmaker? ( dev-python/wmdocklib[${PYTHON_USEDEP}] )
- >=x11-libs/gtk+-3.0.0[introspection]
- x11-libs/vte[introspection]
- >=media-sound/jack-audio-connection-kit-0.109.2-r2[dbus]"
+ >=media-sound/jack-audio-connection-kit-0.109.2-r2[dbus]
+ >=x11-libs/gtk+-3.2.2:3[introspection]
+ >=x11-libs/vte-0.30.1:2.90[introspection]
+ wmaker? ( dev-python/wmdocklib[${PYTHON_USEDEP}] )"
DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
pkg_preinst() {
+ # A small hack to remove all wmladi files. This is needed because
+ # the ebuild should not rely on the python-r1 eclasses' internal
+ # wrappings.
if ! use wmaker ; then
- rm "${D}"/usr/bin/wmladi || die "rm wmladi failed"
- rm "${D}"/usr/bin/wmladi-python2.7 || die "rm wmladi-python2.7 failed"
+ local files=$(find "${D}" | grep wmladi)
+ for file in ${files}; do
+ einfo "Removing ${file} due to USE='-wmaker'"
+ rm ${file}
+ done
fi
}
Deleted: trunk/overlays/proaudio/media-sound/laditools/laditools-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/laditools/laditools-9999.ebuild 2013-11-29 21:52:18 UTC (rev 2810)
+++ trunk/overlays/proaudio/media-sound/laditools/laditools-9999.ebuild 2013-12-01 12:38:07 UTC (rev 2811)
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT="python2_7"
-
-inherit git-2 python-r1 distutils-r1
-
-DESCRIPTION="Control and monitor a LADI system the easy way"
-HOMEPAGE="https://launchpad.net/laditools";
-EGIT_REPO_URI="git://repo.or.cz/laditools.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="wmaker"
-
-RDEPEND="dev-lang/python
- >=dev-python/pygtk-2.12
- dev-python/pyxdg
- >=dev-python/enum-0.4.4
- >=dev-python/pygobject-3.0.0
- dev-python/pyxml
- wmaker? ( dev-python/wmdocklib )
- >=x11-libs/gtk+-3.0.0[introspection]
- x11-libs/vte[introspection]
- >=media-sound/jack-audio-connection-kit-0.109.2-r2[dbus]"
-DEPEND="dev-python/python-distutils-extra"
-
-pkg_preinst() {
- if ! use wmaker ; then
- rm "${D}"/usr/bin/wmladi || die "rm wmladi failed"
- rm "${D}"/usr/bin/wmladi-python2.7 || die "rm wmladi-python2.7 failed"
- fi
-}