summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2003-12-24 19:41:40 +0000
committerCaleb Tennis <caleb@gentoo.org>2003-12-24 19:41:40 +0000
commitb28fa5f7adedac9dc5d406ea21453df5d8ca14e8 (patch)
tree21d0f71a6233441f9d8d121f48534cb2f8fa7d8b /kde-base
parentPulling. Duplicate of media-fonts/aquafont. (diff)
downloadgentoo-2-b28fa5f7adedac9dc5d406ea21453df5d8ca14e8.tar.gz
gentoo-2-b28fa5f7adedac9dc5d406ea21453df5d8ca14e8.tar.bz2
gentoo-2-b28fa5f7adedac9dc5d406ea21453df5d8ca14e8.zip
dependency cleanups
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase/ChangeLog5
-rw-r--r--kde-base/kdebase/Manifest4
-rw-r--r--kde-base/kdebase/kdebase-3.2.0_beta2.ebuild16
3 files changed, 11 insertions, 14 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index a7be706ec12f..7d244388b084 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdebase
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.101 2003/12/02 02:04:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.102 2003/12/24 19:41:32 caleb Exp $
+
+ 24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta2.ebuild:
+ Dependency cleanups.
*kdebase-3.2.0_beta2 (01 Dec 2003)
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 7d2f28307dc1..30ba4c1a3a6a 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,10 +1,10 @@
MD5 0ddf72a18a286698c80e009c517ea462 kdebase-3.2.0_beta1-r1.ebuild 3614
MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791
-MD5 9e84a17a8c08e639e4d9fe562f6c17f4 kdebase-3.2.0_beta2.ebuild 3611
+MD5 08ae898de787c2a7886930c191181a67 kdebase-3.2.0_beta2.ebuild 3117
MD5 924761c92da94a05214375c0d374e947 kdebase-3.0.5b.ebuild 7924
MD5 0435e781dab8701a5abeca3c68b425e0 kdebase-3.1.4.ebuild 4011
MD5 2e7914e7f0c37c2da3d1db99bbf38d1f kdebase-3.0.4-r3.ebuild 4486
-MD5 0a87008b73614cbdf6d3c35ca95c5d94 ChangeLog 18039
+MD5 79ebe35ca8023b1d80804140a3547b78 ChangeLog 18138
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
diff --git a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild
index 529422302eef..b5f1fff3a994 100644
--- a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild
+++ b/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.1 2003/12/02 02:04:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.2 2003/12/24 19:41:32 caleb Exp $
inherit kde-dist eutils
-IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
+IUSE="ldap pam motif encode cups ssl opengl samba java"
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
KEYWORDS="~x86"
@@ -13,7 +13,6 @@ DEPEND="media-sound/cdparanoia
pam? ( sys-libs/pam )
motif? ( virtual/motif )
encode? ( media-sound/lame )
- oggvorbis? ( media-libs/libvorbis )
cups? ( net-print/cups )
ssl? ( dev-libs/openssl )
opengl? ( virtual/opengl )
@@ -21,19 +20,14 @@ DEPEND="media-sound/cdparanoia
java? ( virtual/jdk )
>=media-libs/freetype-2
dev-util/pkgconfig"
-# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
RDEPEND="sys-apps/eject"
myconf="$myconf --with-dpms --with-cdparanoia"
+myconf="$myconf `use_with ldap` `use_with motif`"
+myconf="$myconf `use_with encode lame` `use_with cups`"
+myconf="$myconf `use_with opengl gl` `use_with ssl`"
-use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap"
-use motif && myconf="$myconf --with-motif" || myconf="$myconf --without-motif"
-use encode && myconf="$myconf --with-lame" || myconf="$myconf --without-lame"
-use cups && myconf="$myconf --with-cups" || myconf="$myconf --disable-cups"
-use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis"
-use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl"
-use ssl && myconf="$myconf --with-ssl" || myconf="$myconf --without-ssl"
use pam && myconf="$myconf --with-pam=yes" || myconf="$myconf --with-pam=no --with-shadow"
use java && myconf="$myconf --with-java=$(java-config --jdk-home)" || myconf="$myconf --without-java"