summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 13:12:07 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 13:12:07 +0000
commitac09bfd8f8e1c1a3cbd65b22888227f80cf0d040 (patch)
tree6318479a47c53211526efd3f71ede54bc585d727 /x11-misc/mixer_app
parentRemoved old version. (diff)
downloadgentoo-2-ac09bfd8f8e1c1a3cbd65b22888227f80cf0d040.tar.gz
gentoo-2-ac09bfd8f8e1c1a3cbd65b22888227f80cf0d040.tar.bz2
gentoo-2-ac09bfd8f8e1c1a3cbd65b22888227f80cf0d040.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-misc/mixer_app')
-rw-r--r--x11-misc/mixer_app/ChangeLog8
-rw-r--r--x11-misc/mixer_app/files/digest-mixer_app-1.7.01
-rw-r--r--x11-misc/mixer_app/mixer_app-1.7.0.ebuild32
-rw-r--r--x11-misc/mixer_app/mixer_app-1.8.0.ebuild12
4 files changed, 15 insertions, 38 deletions
diff --git a/x11-misc/mixer_app/ChangeLog b/x11-misc/mixer_app/ChangeLog
index 473c8ef745a8..1a74c101de74 100644
--- a/x11-misc/mixer_app/ChangeLog
+++ b/x11-misc/mixer_app/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/mixer_app
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.16 2005/11/01 13:22:55 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/ChangeLog,v 1.17 2006/01/21 13:12:07 nelchael Exp $
+
+ 21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+ -mixer_app-1.7.0.ebuild, mixer_app-1.8.0.ebuild:
+ Fixed DEPEND for modular X.
01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> mixer_app-1.7.0.ebuild,
mixer_app-1.8.0.ebuild:
diff --git a/x11-misc/mixer_app/files/digest-mixer_app-1.7.0 b/x11-misc/mixer_app/files/digest-mixer_app-1.7.0
deleted file mode 100644
index 09217fa2efcb..000000000000
--- a/x11-misc/mixer_app/files/digest-mixer_app-1.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ab5dca4458d3d6202131f497aadcb27 Mixer.app-1.7.0.tar.gz 19101
diff --git a/x11-misc/mixer_app/mixer_app-1.7.0.ebuild b/x11-misc/mixer_app/mixer_app-1.7.0.ebuild
deleted file mode 100644
index c168e91751d1..000000000000
--- a/x11-misc/mixer_app/mixer_app-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.7.0.ebuild,v 1.11 2005/11/01 13:22:55 nelchael Exp $
-
-#need to do some name mangling
-#so that ebuild name adheres to "standart"
-Name=Mixer.app
-S=${WORKDIR}/${Name}-${PV}
-
-DESCRIPTION="Mixer.app is a mixer utility that has three volume controllers that can be configured to handle any sound source, the default sources are master-, cd- and pcm-volume."
-SRC_URI="http://www.fukt.bth.se/~per/mixer/${Name}-${PV}.tar.gz"
-HOMEPAGE="http://www.fukt.bth.se/~per/mixer/"
-DEPEND="virtual/libc virtual/x11"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-src_compile() {
- emake || die
-
-}
-
-src_install () {
- #make DESTDIR=${D} install || die
- dobin Mixer.app
-
- dodoc README ChangeLog
-}
-
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 1c938a04f1ac..0d64af5ce68e 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.9 2005/11/01 13:22:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mixer_app/mixer_app-1.8.0.ebuild,v 1.10 2006/01/21 13:12:07 nelchael Exp $
#need to do some name mangling
#so that ebuild name adheres to "standart"
@@ -16,7 +16,13 @@ SLOT="0"
KEYWORDS="x86 ppc sparc"
IUSE=""
-DEPEND="virtual/libc virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( x11-proto/xextproto virtual/x11 )"
src_compile() {
emake || die