From: Samuli Suominen Date: Mon, 9 Jan 2012 16:56:05 +0000 (+0000) Subject: One of USE alsa, jack, nas or oss must be enabled; use REQUIRED_USE X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=daf5b8ae91ec1db028f61613f728287d60a66a3f;p=gentoo.git One of USE alsa, jack, nas or oss must be enabled; use REQUIRED_USE Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog index dd32801c0334..6bed959ab699 100644 --- a/media-sound/alsaplayer/ChangeLog +++ b/media-sound/alsaplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/alsaplayer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.75 2012/01/09 16:49:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.76 2012/01/09 16:56:05 ssuominen Exp $ + + 09 Jan 2012; Samuli Suominen + alsaplayer-0.99.81.ebuild: + One of USE alsa, jack, nas or oss must be enabled; use REQUIRED_USE 09 Jan 2012; Samuli Suominen alsaplayer-0.99.80-r1.ebuild, alsaplayer-0.99.81.ebuild: diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest index c340ef33cfb9..44bbf0e1b036 100644 --- a/media-sound/alsaplayer/Manifest +++ b/media-sound/alsaplayer/Manifest @@ -8,17 +8,17 @@ AUX alsaplayer-0.99.80_rc3-flags.patch 3905 RMD160 32e721a50403608816f356d07e6e1 DIST alsaplayer-0.99.80.tar.bz2 805045 RMD160 41248dff120a01bf286c1616fa6b968ad6cdf16a SHA1 883d590b01371840024b5a8bf0fe95b464a2ccd1 SHA256 9020e2214d7c7a6a3a3f6a310538cfa6226eaeccb8c08de3b72d69d186d7cb83 DIST alsaplayer-0.99.81.tar.bz2 806906 RMD160 1b4318effef805f83a54b2ef2a759b349222f7cc SHA1 25817ebd1e5c36da31a88363315a1bf7a945ddfd SHA256 187897e5ad5a94ea819e42092cc35d53463e5fa43a3a5a78cb76ffd0d5ddee11 EBUILD alsaplayer-0.99.80-r1.ebuild 2346 RMD160 2885e92a5fe38b668c1a1c9b863b2928cfcda127 SHA1 85fd2b39b4a56359161a968853bebb026bff5bca SHA256 c298e42b4e60fc45b868374137bf3df3ac63cc024722ee803108fb78e863592d -EBUILD alsaplayer-0.99.81.ebuild 2194 RMD160 c2a83bd01c606779856cf38256903f4ebf75d143 SHA1 d99c9e4b14f140f97a63ab9795570cc3f76ce3db SHA256 73b219e35e9e4a9a6427f10689ce629e4ea38485452d93718911ed6b87e5ef57 -MISC ChangeLog 12661 RMD160 30b04f1ecb8d48a50e401de35486af5d56c8dfc9 SHA1 e323cd5038ec55bfbc1a8f4ab6f4c45622853ce8 SHA256 86212fd8e985a707a7a459a4956942ef96b2d82c3caff51b4d82e15914dc13c6 +EBUILD alsaplayer-0.99.81.ebuild 2145 RMD160 207a09d44b8422fe7840a62058975cb828ce1b27 SHA1 bd478b01bd376bc162ab9b73a6be99101cf958b7 SHA256 3030c4809e35bb40434f8f4c0ed923cfd0d79c623e6933a20097b5fc732014bb +MISC ChangeLog 12815 RMD160 53faf8e30b7ec37c1a1985eb90b220aeedb36577 SHA1 78f017918e4ab6e0f3f908832f6d4822258f89d6 SHA256 9ac0b8e47bd5279c59ea665e8f947510ce06fb33105a35dd078e47f3549f9134 MISC metadata.xml 341 RMD160 fca633f681459e6cd1d93d888a2b2e5da920e543 SHA1 85284280353c67c730caa8a4234819e93a00dc1a SHA256 a72c02aab2777d0b915689af7197a58c95876bd83dd6bfd70bd51ea8f50089c6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPCxpcAAoJEEdUh39IaPFNW6oIAIT3hevZTfE9+hfbqjWwT/4F -OMwxlMlGoajd1qcDm/zVWRE11nDsCcseTjrdTp6205RrYGdpnlY81MMAc2zTw007 -dPLYhw2M+jf/Y/l+RAN/HX9qcC8+dB19llhzxU3c2dawi58QDWzJPGiU7hs4EEEY -cw45yLkec/tvatHxNIlbD5OI03kalFFv3R0CifOSRQ2iCCRx1XTE1eLrMN0chMAg -TAPLCh1i7+fymjeBZHJ0lPZ2tPfu7/OLATy7PgnzZ73POS+FAhLtpvEtARw8IW56 -tO5CdvpQ1IEjj3AZoC+D8I0dP9Mf+BblHhg5QQa69o27YjqZHaUjZnozGctvhHg= -=EN5o +iQEcBAEBAgAGBQJPCxvSAAoJEEdUh39IaPFNW+AH/RrJz5Fy7GRRisVLkpNkhQhz +YPgNl0atmIrtM3tNQGbo29TzabqOrGrYfdDUCy0ZWUQRLwnEMVt1hj+TH3Bqw1/9 +ps1dua1EkIbjrXFr0PSz/hv/fNvXrmckSDQ5Nc1v0iV+4OCeVH8kvQBejh+UORnm +SmM7c/l0x2DAZ5MijFoNn47DoCJ2R9uDDmio7Bndgas4PShE5E0xxRWAOGO84KuM +7d/1fb9FU4C4jwu6Qq6Md+biDW4untgh3+jJ8T/2es5AAzLMav/SSV3gGFvhscxD +EvLP+KKpl2ZiFOMSTQlJhYY7bLGFMEF8raWN/Qk2Qsxu+Kl7ySNepSNr9EkVYm0= +=9WtH -----END PGP SIGNATURE----- diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild index 2b3ac9a68481..b5430401dd32 100644 --- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild +++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.3 2012/01/09 16:49:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.4 2012/01/09 16:56:05 ssuominen Exp $ EAPI=4 inherit autotools eutils @@ -32,7 +32,9 @@ RDEPEND="media-libs/libsndfile DEPEND="${RDEPEND} dev-util/pkgconfig doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + oss? ( virtual/os-headers )" +REQUIRED_USE="|| ( alsa jack nas oss )" src_prepare() { sed -i \ @@ -50,11 +52,6 @@ src_configure() { use doc || export ac_cv_prog_HAVE_DOXYGEN=false use xosd || export ac_cv_lib_xosd_xosd_create=no - local myconf - if ! use alsa && ! use oss && ! use jack && ! use nas; then - myconf="--enable-oss" - fi - econf \ --docdir=/usr/share/doc/${PF} \ $(use_enable nls) \ @@ -71,8 +68,7 @@ src_configure() { --disable-esd \ $(use_enable oss) \ $(use_enable gtk gtk2) \ - $(use_enable nas) \ - ${myconf} + $(use_enable nas) } src_install() {