diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-03-22 09:59:02 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-03-22 09:59:02 +0000 |
commit | 9c8bbf9fe5e8d6e6da2df3614cc477f16f1aaf3e (patch) | |
tree | e9f5402ea2630d3ab0452b556582f19ee44bbcc5 /media-sound/alsa-tools | |
parent | Add optional hires icons, and fix slot-deps on gnome libs (diff) | |
download | historical-9c8bbf9fe5e8d6e6da2df3614cc477f16f1aaf3e.tar.gz historical-9c8bbf9fe5e8d6e6da2df3614cc477f16f1aaf3e.tar.bz2 historical-9c8bbf9fe5e8d6e6da2df3614cc477f16f1aaf3e.zip |
Restrict fltk version being able to return includedir or hardcode includedir
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'media-sound/alsa-tools')
-rw-r--r-- | media-sound/alsa-tools/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/alsa-tools/Manifest | 22 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.21.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.22.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.23.ebuild | 6 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild | 8 |
9 files changed, 40 insertions, 34 deletions
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog index 84818ffa334e..01a1b840eab8 100644 --- a/media-sound/alsa-tools/ChangeLog +++ b/media-sound/alsa-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.200 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.201 2011/03/22 09:59:02 jlec Exp $ + + 22 Mar 2011; Justin Lecher <jlec@gentoo.org> alsa-tools-1.0.20-r1.ebuild, + alsa-tools-1.0.20-r2.ebuild, alsa-tools-1.0.21.ebuild, + alsa-tools-1.0.21-r1.ebuild, alsa-tools-1.0.22.ebuild, + alsa-tools-1.0.23.ebuild, alsa-tools-1.0.24.1.ebuild: + Restrict fltk version being able to return includedir or hardcode includedir 20 Mar 2011; Justin Lecher <jlec@gentoo.org> alsa-tools-1.0.20-r1.ebuild, alsa-tools-1.0.20-r2.ebuild, alsa-tools-1.0.21.ebuild, diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 83b8fd92ad3f..8f5007738a3c 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -9,19 +9,19 @@ DIST alsa-tools-1.0.21.tar.bz2 1556178 RMD160 639acff29e783dd36d4404f353eacbe99d DIST alsa-tools-1.0.22.tar.bz2 1555768 RMD160 2bfc7c047341cfdae25610db0fac6223a330a0e4 SHA1 7c4ad5cf600fb9943b43a557995dc7ef93c00e9d SHA256 4185a075287072f91df8eee5a37d99a688093cd231226909e3c8b57db775fb40 DIST alsa-tools-1.0.23.tar.bz2 1603719 RMD160 140e5f19874c1f7d43f5b0bd26b8ef1fe0060370 SHA1 4683fa0bd151d4a17c45125aebd8eaec58cf6ca3 SHA256 5e048633f0324c11998cdbc283ced30d72887f9bed1f2aeb85b9ee5e9e907099 DIST alsa-tools-1.0.24.1.tar.bz2 1716198 RMD160 1a8f83d716900ca665e1a0105ea5771b9b215e13 SHA1 1b3e3c13caf16760d6a7523c08ef7b75ff09e238 SHA256 17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05 -EBUILD alsa-tools-1.0.20-r1.ebuild 3571 RMD160 cf8268b26e8ea3bc057cf61b68817595d79f5d8d SHA1 63f6a8e792b02593987cf161dabbc8721a49d4e5 SHA256 7281cab778aefc1d40539b8a8eed87f121bb2666ed7847449db21a20fb0433f0 -EBUILD alsa-tools-1.0.20-r2.ebuild 3629 RMD160 d248d0a1faf898bbb211a4d00242bf4953b1b9e9 SHA1 63a63c86be5c287d9ecac7d9759083db07ce4d7e SHA256 98223f7280ca12fe562f17075957988b251c7f8f04e4e4851c1663f31ceb9faa -EBUILD alsa-tools-1.0.21-r1.ebuild 3536 RMD160 c3f1edfc08bae78d0bb195f5bd01313d0fd92d50 SHA1 315a8163280c46e5ddff1e1f634fa87dd8491773 SHA256 b538acd40017a5615b219483d593d704baebb5ad33c8ba452c30b20e8cd1e921 -EBUILD alsa-tools-1.0.21.ebuild 3472 RMD160 bad7c2f104a5da72f0ed94a3b37375e9343ca867 SHA1 5e54185a1e158faea27bd1dc05f282344720ed70 SHA256 493ebdca4f1e2343b6c52452193cc3186c9bef310266518d398acfe9ef078811 -EBUILD alsa-tools-1.0.22.ebuild 3547 RMD160 8cb9dd853ab7fe887213bee982f26385f249276d SHA1 79340143d225b6252d1eb3a19de95b648dccfc5a SHA256 f4bc1f959505e795ff35beca161660993470a3f5507d4fd6edd88ec537e0ee28 -EBUILD alsa-tools-1.0.23.ebuild 3576 RMD160 0282ece3135d59b6d4bfc274b1087c87a4b82bce SHA1 14023fea853fa085b861d2d305c58491c1f2ed54 SHA256 0d95a685ba310f22cf88b3df598b94b0fa4ea718ff266922000eac8e41595c06 -EBUILD alsa-tools-1.0.24.1.ebuild 3775 RMD160 66698a23cbd793d810166b49d80317fb1ea721cf SHA1 ff7f3f9cbefe7651d6d4fac68553893b06ae5dc9 SHA256 e456a5eab56ef50ba0c1db0fe48c02786dc2ceaa7a2acc22c618cdeb32677d11 -MISC ChangeLog 29258 RMD160 30fbeff5fde8141a0066c8d8176db4f614e2bce4 SHA1 f59c6e40827798c197daa9c7842ffdcd734b31d2 SHA256 5931dfd24bb354aa2fca5366276e937f7762846aade33d19bb0c6a7413b258f9 +EBUILD alsa-tools-1.0.20-r1.ebuild 3536 RMD160 682b44ffab548ef3a70dc0a06bb66ed9a7b4c49c SHA1 81bd776e495937ac7c7a9f60d2e15c0e29cd6fb9 SHA256 ce9b7990b3add4d8d8dd5d4c444bcfa69499ec17c3f0a718c2b21713cfb59054 +EBUILD alsa-tools-1.0.20-r2.ebuild 3614 RMD160 c497860f96969eab0c85746fcbcdc804488a278e SHA1 89813e7f83c127642ad326e2c916f2b57366e318 SHA256 44650e9f892a726ec29ff095ef1040c3f985cb692374922325d4b48a648727ca +EBUILD alsa-tools-1.0.21-r1.ebuild 3521 RMD160 d2d13fa395f394327d5ad51634256b94482c0fcb SHA1 478769b3607dfb3e557514ed42b8472188a12ad4 SHA256 239503d179b3d935ea51adc238282b6518a7576a95b073afcad1a422304bf8ec +EBUILD alsa-tools-1.0.21.ebuild 3437 RMD160 a94434e3f9a8bad3707a39202bfd25bde7a53edf SHA1 ebd1693807d09f9c5d3e6ce01b8f0daff27bdb8c SHA256 4a58deaf816e52b467fbcc50d16da06635072ed0a2ba7ff56eb50ff9d3300d98 +EBUILD alsa-tools-1.0.22.ebuild 3532 RMD160 e671e7fe484a6a0d1105cae3e68a83d68bc923dd SHA1 df890258fc8a6cdee15077fdb6969e5f800df9c3 SHA256 7be33fec47b885c2ea2f3030f10eb910aee5ea17d9d652181918f951736eb567 +EBUILD alsa-tools-1.0.23.ebuild 3542 RMD160 d6c7d7bb8d5d81e8d801aa27969cbf9e1e1947e3 SHA1 6fd6971e3f25296ec7ba1fd852f1ee661c700bcf SHA256 e8393502a46ab920a2d6d4739a442ded8a42c97fdeb56981d821a352e0fe316d +EBUILD alsa-tools-1.0.24.1.ebuild 3733 RMD160 5ac80abd7e1194e2240f91e2c262a3008f5348e4 SHA1 e2d9baf42e524d9969882d1bad3629af4b204b88 SHA256 b70aee9a1644c2f5fe37ac3036105288f2a61ecf604a8b2cfbecdaea4b34ee8e +MISC ChangeLog 29584 RMD160 2e909e8693250c31f6111328db04b698893e03f7 SHA1 985e66e62475d498d96af870105e834c7d038ab0 SHA256 2fa705adcbadf4fa0a44998ca4aa65729923c9c0e7fd4128533181cb4fd37740 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2GX+MACgkQgAnW8HDreRazIACgpMlG+fvdTY8rzDnZxypfkNUU -CwgAoMExwl1A3Hd/GQtl15G3AZcQaXcl -=eM7P +iEYEARECAAYFAk2Icu0ACgkQgAnW8HDreRaBDwCgrx8fGUlofjHUflMgYhBTU/OR +u3wAoKUZXe4DzYGgtomkfEqMbE05KXp+ +=ifw5 -----END PGP SIGNATURE----- diff --git a/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild index 7a202281e87d..52c2da88d84e 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v 1.8 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r1.ebuild,v 1.9 2011/03/22 09:59:02 jlec Exp $ EAPI=1 @@ -104,14 +104,14 @@ src_compile() { if use fltk; then # hdspmixer requires fltk append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" + append-flags "-I/usr/include/fltk-1" fi local f for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild index f8dad91d9bf4..1606a7105550 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.20-r2.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $ EAPI=1 @@ -28,7 +28,7 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr ${ECHOAUDIO_CARDS}" RDEPEND=">=media-libs/alsa-lib-1.0.20-r1 - fltk? ( x11-libs/fltk:1 ) + fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND}" @@ -112,7 +112,7 @@ src_compile() { for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild index 105caaceac03..1bfc8e2a0af8 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21-r1.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $ EAPI="1" @@ -28,7 +28,7 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr ${ECHOAUDIO_CARDS}" RDEPEND=">=media-libs/alsa-lib-1.0.20-r1 - fltk? ( x11-libs/fltk:1 ) + fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND}" @@ -110,7 +110,7 @@ src_compile() { for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild index 8b726a01246f..fad4f0e4d208 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v 1.7 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.21.ebuild,v 1.8 2011/03/22 09:59:02 jlec Exp $ EAPI=1 @@ -101,14 +101,14 @@ src_compile() { if use fltk; then # hdspmixer requires fltk append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" + append-flags "-I/usr/include/fltk-1" fi local f for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild index 8c89ae87ace8..5e8026476f26 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v 1.3 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.22.ebuild,v 1.4 2011/03/22 09:59:02 jlec Exp $ EAPI="1" @@ -28,7 +28,7 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr ${ECHOAUDIO_CARDS}" RDEPEND=">=media-libs/alsa-lib-1.0.20-r1 - fltk? ( x11-libs/fltk:1 ) + fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND}" @@ -111,7 +111,7 @@ src_compile() { for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild index e7e110fe0245..d9843e66a787 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v 1.9 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild,v 1.10 2011/03/22 09:59:02 jlec Exp $ EAPI=1 inherit eutils flag-o-matic autotools @@ -104,14 +104,14 @@ src_compile() { if use fltk; then # hdspmixer requires fltk append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" + append-flags "-I/usr/include/fltk-1" fi local f for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 emake || die "emake ${f} failed" done } diff --git a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild index 0119301097fe..1f0b1dc5a211 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v 1.2 2011/03/20 20:13:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $ EAPI=3 inherit base flag-o-matic autotools @@ -28,7 +28,7 @@ ${ECHOAUDIO_CARDS}" RDEPEND=">=media-libs/alsa-lib-${PV} >=dev-python/pyalsa-1.0.24 - fltk? ( x11-libs/fltk:1 ) + fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND}" @@ -110,10 +110,10 @@ src_configure() { cd "${S}/${f}" case "${f}" in echomixer,envy24control,rmedigicontrol ) - econf --with-gtk2 || die "econf ${f} failed" + econf --with-gtk2 ;; * ) - econf || die "econf ${f} failed" + econf ;; esac done |