| 1 |
drac 08/03/27 10:45:19 |
| 2 |
|
| 3 |
Modified: darkice-0.18.1.ebuild ChangeLog |
| 4 |
Removed: darkice-0.17.1.ebuild |
| 5 |
Log: |
| 6 |
If none of USE flags encode, aac, vorbis or twolame is selected, select vorbis so ebuild doesn't annoyingly die and ewarn it about user. Apply GCC 4.3 fix from 214773, thanks to impulze. |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-sound/darkice/darkice-0.18.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: darkice-0.18.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- darkice-0.18.1.ebuild 22 Dec 2007 17:08:43 -0000 1.6 |
| 23 |
+++ darkice-0.18.1.ebuild 27 Mar 2008 10:45:18 -0000 1.7 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2007 Gentoo Foundation |
| 26 |
+# Copyright 1999-2008 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild,v 1.6 2007/12/22 17:08:43 dertobi123 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild,v 1.7 2008/03/27 10:45:18 drac Exp $ |
| 30 |
|
| 31 |
inherit eutils |
| 32 |
|
| 33 |
@@ -13,25 +13,26 @@ |
| 34 |
KEYWORDS="amd64 hppa ppc sparc x86" |
| 35 |
IUSE="aac alsa encode jack twolame vorbis" |
| 36 |
|
| 37 |
-DEPEND="encode? ( >=media-sound/lame-1.89 ) |
| 38 |
- vorbis? ( >=media-libs/libvorbis-1.0 ) |
| 39 |
+RDEPEND="encode? ( media-sound/lame ) |
| 40 |
+ vorbis? ( media-libs/libvorbis ) |
| 41 |
aac? ( media-libs/faac ) |
| 42 |
- twolame? ( >=media-sound/twolame-0.3.6 ) |
| 43 |
- alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
| 44 |
- jack? ( media-sound/jack-audio-connection-kit )" |
| 45 |
+ twolame? ( media-sound/twolame ) |
| 46 |
+ alsa? ( media-libs/alsa-lib ) |
| 47 |
+ jack? ( media-sound/jack-audio-connection-kit ) |
| 48 |
+ !encode? ( !vorbis? ( !aac? ( !twolame? ( media-libs/libvorbis ) ) ) )" |
| 49 |
+DEPEND="${RDEPEND}" |
| 50 |
+ |
| 51 |
+src_unpack() { |
| 52 |
+ unpack ${A} |
| 53 |
+ cd "${S}" |
| 54 |
+ epatch "${FILESDIR}"/${P}-gcc43.patch |
| 55 |
+} |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
- if ! use encode && ! use vorbis && ! use aac && ! use twolame |
| 59 |
- then |
| 60 |
- eerror "You need support for mp3, Ogg Vorbis, AAC or MP2 enconding" |
| 61 |
- eerror "for this package. Please merge again with at least one of the" |
| 62 |
- eerror "\`encode', \`vorbis', \`aac' and \`twolame' USE flags enabled:" |
| 63 |
- eerror |
| 64 |
- eerror " # USE=\"encode\" emerge darkice" |
| 65 |
- eerror " # USE=\"vorbis\" emerge darkice" |
| 66 |
- eerror " # USE=\"aac\" emerge darkice" |
| 67 |
- eerror " # USE=\"twolame\" emerge darkice" |
| 68 |
- die "Won't build without support for lame, vorbis, aac nor twolame" |
| 69 |
+ if ! use encode && ! use vorbis && ! use aac && ! use twolame; then |
| 70 |
+ ewarn "One of USE flags encode, vorbis, aac, or twolame is required." |
| 71 |
+ ewarn "Selecting vorbis for you." |
| 72 |
+ local myconf="--with-vorbis" |
| 73 |
fi |
| 74 |
|
| 75 |
econf $(use_with aac faac) \ |
| 76 |
@@ -39,7 +40,8 @@ |
| 77 |
$(use_with encode lame) \ |
| 78 |
$(use_with jack) \ |
| 79 |
$(use_with twolame) \ |
| 80 |
- $(use_with vorbis) || die "econf failed." |
| 81 |
+ $(use_with vorbis) \ |
| 82 |
+ ${myconf} |
| 83 |
emake || die "emake failed." |
| 84 |
} |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.47 media-sound/darkice/ChangeLog |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?rev=1.47&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?rev=1.47&content-type=text/plain |
| 93 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?r1=1.46&r2=1.47 |
| 94 |
|
| 95 |
Index: ChangeLog |
| 96 |
=================================================================== |
| 97 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v |
| 98 |
retrieving revision 1.46 |
| 99 |
retrieving revision 1.47 |
| 100 |
diff -u -r1.46 -r1.47 |
| 101 |
--- ChangeLog 22 Dec 2007 17:08:43 -0000 1.46 |
| 102 |
+++ ChangeLog 27 Mar 2008 10:45:18 -0000 1.47 |
| 103 |
@@ -1,6 +1,13 @@ |
| 104 |
# ChangeLog for media-sound/darkice |
| 105 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 106 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.46 2007/12/22 17:08:43 dertobi123 Exp $ |
| 107 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.47 2008/03/27 10:45:18 drac Exp $ |
| 109 |
+ |
| 110 |
+ 27 Mar 2008; Samuli Suominen <drac@g.o> |
| 111 |
+ -files/darkice-0.17.1-64bit.patch, +files/darkice-0.18.1-gcc43.patch, |
| 112 |
+ -darkice-0.17.1.ebuild, darkice-0.18.1.ebuild: |
| 113 |
+ If none of USE flags encode, aac, vorbis or twolame is selected, select |
| 114 |
+ vorbis so ebuild doesn't annoyingly die and ewarn it about user. Apply GCC |
| 115 |
+ 4.3 fix from 214773, thanks to impulze. |
| 116 |
|
| 117 |
22 Dec 2007; Tobias Scherbaum <dertobi123@g.o> |
| 118 |
darkice-0.18.1.ebuild: |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
-- |
| 123 |
gentoo-commits@l.g.o mailing list |
Archives