Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 36312 Details for
Bug 58640
kdelibs/kdebase/kdepim/kdemultimedia dependency cleanup
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
kde3.3-deps.patch
kde3.3-deps.patch (text/plain), 5.30 KB, created by
Gregorio Guidi (RETIRED)
on 2004-07-28 03:32:10 UTC
(
hide
)
Description:
kde3.3-deps.patch
Filename:
MIME Type:
Creator:
Gregorio Guidi (RETIRED)
Created:
2004-07-28 03:32:10 UTC
Size:
5.30 KB
patch
obsolete
>diff -ur kde-base.orig/kdebase/kdebase-3.3.0_beta2.ebuild kde-base/kdebase/kdebase-3.3.0_beta2.ebuild >--- kde-base.orig/kdebase/kdebase-3.3.0_beta2.ebuild 2004-07-28 11:49:27.553245544 +0200 >+++ kde-base/kdebase/kdebase-3.3.0_beta2.ebuild 2004-07-28 09:25:50.000000000 +0200 >@@ -7,20 +7,16 @@ > DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." > > KEYWORDS="~x86 ~amd64" >-IUSE="ldap pam motif encode cups ssl opengl samba java arts" >+IUSE="ldap pam cups ssl opengl samba java arts" > >-DEPEND="media-sound/cdparanoia >- ldap? ( net-nds/openldap ) >+DEPEND="ldap? ( net-nds/openldap ) > pam? ( sys-libs/pam ) >- motif? ( x11-libs/openmotif ) >- encode? ( media-sound/lame ) > cups? ( net-print/cups ) > ssl? ( dev-libs/openssl ) > opengl? ( virtual/opengl ) >- samba? ( net-fs/samba ) >+ samba? ( >=net-fs/samba-3.0.4 ) > java? ( || ( virtual/jdk virtual/jre ) ) >- arts? ( ~kde-base/arts-${PV//3.3/1.3} ) >- >=media-libs/freetype-2" >+ arts? ( ~kde-base/arts-${PV//3.3/1.3} )" > RDEPEND="${DEPEND} > sys-apps/eject" > >@@ -29,9 +25,9 @@ > } > > src_compile() { >- 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 --with-dpms" >+ myconf="$myconf `use_with ldap`" >+ myconf="$myconf `use_with cups`" > myconf="$myconf `use_with opengl gl` `use_with ssl`" > myconf="$myconf `use_with arts`" > >diff -ur kde-base.orig/kdelibs/kdelibs-3.3.0_beta2.ebuild kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild >--- kde-base.orig/kdelibs/kdelibs-3.3.0_beta2.ebuild 2004-07-28 11:49:27.546246608 +0200 >+++ kde-base/kdelibs/kdelibs-3.3.0_beta2.ebuild 2004-07-28 09:25:30.000000000 +0200 >@@ -15,13 +15,13 @@ > LICENSE="GPL-2 LGPL-2" > SLOT="3.3" > KEYWORDS="~x86 ~amd64" >-IUSE="alsa cups ipv6 ssl doc ldap arts" >+IUSE="alsa cups ipv6 ssl doc ldap arts tiff" > > # kde.eclass has kdelibs in DEPEND, and we can't have that in here. > # so we recreate the entire DEPEND from scratch. > DEPEND=">=sys-devel/autoconf-2.58 > >=sys-devel/automake-1.8 >- >=app-arch/bzip2 >+ app-arch/bzip2 > >=dev-libs/libxslt-1.1.4 > >=dev-libs/libxml2-2.6.6 > >=dev-libs/libpcre-4.2 >@@ -30,18 +30,18 @@ > arts? ( ~kde-base/arts-1.3.0_beta2 ) > cups? ( >=net-print/cups-1.1.19 ) > ldap? ( >=net-nds/openldap-2.1.26 ) >- media-libs/tiff >+ tiff? ( media-libs/tiff ) > >=app-admin/fam-2.7.0 > virtual/ghostscript > media-libs/libart_lgpl > net-dns/libidn >+ sys-apps/utempter > sys-devel/gettext > >=x11-libs/qt-3.3.2" > RDEPEND="${DEPEND} > app-text/sgml-common > cups? ( net-print/cups ) >- doc? ( app-doc/doxygen ) >- dev-lang/python" >+ doc? ( app-doc/doxygen )" > > src_unpack() { > kde_src_unpack >diff -ur kde-base.orig/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild >--- kde-base.orig/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild 2004-07-28 11:49:27.560244480 +0200 >+++ kde-base/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild 2004-07-28 11:58:14.153190184 +0200 >@@ -7,16 +7,16 @@ > DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..." > > KEYWORDS="~x86 ~amd64" >-IUSE="flac encode oggvorbis alsa gstreamer" >+IUSE="flac speex encode oggvorbis xine alsa" > > DEPEND="~kde-base/kdebase-${PV} > media-sound/cdparanoia >+ oggvorbis? ( media-libs/libvorbis media-libs/libogg ) > flac? ( media-libs/flac ) >+ speex? ( >=media-libs/speex-1.1.5 ) > encode? ( media-sound/lame ) >- oggvorbis? ( media-libs/libvorbis media-libs/libogg ) >- >=media-libs/xine-lib-1_beta12 >+ xine? ( >=media-libs/xine-lib-1_beta12 ) > alsa? ( media-libs/alsa-lib ) >- gstreamer? ( media-libs/gstreamer ) > media-sound/trm > media-libs/taglib > !media-sound/juk" >@@ -30,16 +30,16 @@ > # Still persists with 3.2.1 - kaboodle > filter-flags "-fno-default-inline" > >- myconf="$myconf --with-xine-prefix=/usr" >+ myconf="$myconf --with-xine-prefix=/usr --with-cdparanoia" > > # make -j2 fails, at least on ppc > use ppc && export MAKEOPTS="$MAKEOPTS -j1" > use hppa && append-flags -ffunction-sections > >- # alsa 0.9 not supported > use alsa && myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa" > use oggvorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis" > use encode && myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame" >+ use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin" > > myconf="$myconf --disable-strict --disable-warnings" > >diff -ur kde-base.orig/kdepim/kdepim-3.3.0_beta2.ebuild kde-base/kdepim/kdepim-3.3.0_beta2.ebuild >--- kde-base.orig/kdepim/kdepim-3.3.0_beta2.ebuild 2004-07-28 11:49:27.557244936 +0200 >+++ kde-base/kdepim/kdepim-3.3.0_beta2.ebuild 2004-07-28 10:54:53.351999792 +0200 >@@ -7,24 +7,16 @@ > DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." > > KEYWORDS="~x86 ~amd64" >-IUSE="pda crypt ldap" >+IUSE="pda crypt" > >-DEPEND="~kde-base/kdenetwork-${PV} >- pda? ( app-pda/pilot-link dev-libs/libmal ) >- ldap? ( net-nds/openldap ) >- crypt? ( app-crypt/cryptplug app-crypt/gnupg )" >+DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal ) >+ crypt? ( >=app-crypt/gpgme-0.4.5 )" > > src_unpack() { > kde_src_unpack > } > > src_compile() { >- use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock" >+ use crypt && export GPGME_CONFIG="/usr/bin/gpgme4-config" > kde_src_compile > } >- >-src_install() { >- kde_src_install >- docinto html >- dodoc *.html >-}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 58640
: 36312 |
38257