Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 58640 | Differences between
and this patch

Collapse All | Expand All

(-)kde-base.orig/kdebase/kdebase-3.3.0_beta2.ebuild (-11 / +7 lines)
Lines 7-26 Link Here
7
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
7
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
8
8
9
KEYWORDS="~x86 ~amd64"
9
KEYWORDS="~x86 ~amd64"
10
IUSE="ldap pam motif encode cups ssl opengl samba java arts"
10
IUSE="ldap pam cups ssl opengl samba java arts"
11
11
12
DEPEND="media-sound/cdparanoia
12
DEPEND="ldap? ( net-nds/openldap )
13
	ldap? ( net-nds/openldap )
14
	pam? ( sys-libs/pam )
13
	pam? ( sys-libs/pam )
15
	motif? ( x11-libs/openmotif )
16
	encode? ( media-sound/lame )
17
	cups? ( net-print/cups )
14
	cups? ( net-print/cups )
18
	ssl? ( dev-libs/openssl )
15
	ssl? ( dev-libs/openssl )
19
	opengl? ( virtual/opengl )
16
	opengl? ( virtual/opengl )
20
	samba? ( net-fs/samba )
17
	samba? ( >=net-fs/samba-3.0.4 )
21
	java? ( || ( virtual/jdk virtual/jre ) )
18
	java? ( || ( virtual/jdk virtual/jre ) )
22
	arts? ( ~kde-base/arts-${PV//3.3/1.3} )
19
	arts? ( ~kde-base/arts-${PV//3.3/1.3} )"
23
	>=media-libs/freetype-2"
24
RDEPEND="${DEPEND}
20
RDEPEND="${DEPEND}
25
	sys-apps/eject"
21
	sys-apps/eject"
26
22
Lines 29-37 Link Here
29
}
25
}
30
26
31
src_compile() {
27
src_compile() {
32
	myconf="$myconf --with-dpms --with-cdparanoia"
28
	myconf="$myconf --with-dpms"
33
	myconf="$myconf `use_with ldap` `use_with motif`"
29
	myconf="$myconf `use_with ldap`"
34
	myconf="$myconf `use_with encode lame` `use_with cups`"
30
	myconf="$myconf `use_with cups`"
35
	myconf="$myconf `use_with opengl gl` `use_with ssl`"
31
	myconf="$myconf `use_with opengl gl` `use_with ssl`"
36
	myconf="$myconf `use_with arts`"
32
	myconf="$myconf `use_with arts`"
37
33
(-)kde-base.orig/kdelibs/kdelibs-3.3.0_beta2.ebuild (-5 / +5 lines)
Lines 15-27 Link Here
15
LICENSE="GPL-2 LGPL-2"
15
LICENSE="GPL-2 LGPL-2"
16
SLOT="3.3"
16
SLOT="3.3"
17
KEYWORDS="~x86 ~amd64"
17
KEYWORDS="~x86 ~amd64"
18
IUSE="alsa cups ipv6 ssl doc ldap arts"
18
IUSE="alsa cups ipv6 ssl doc ldap arts tiff"
19
19
20
# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
20
# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
21
# so we recreate the entire DEPEND from scratch.
21
# so we recreate the entire DEPEND from scratch.
22
DEPEND=">=sys-devel/autoconf-2.58
22
DEPEND=">=sys-devel/autoconf-2.58
23
	>=sys-devel/automake-1.8
23
	>=sys-devel/automake-1.8
24
	>=app-arch/bzip2
24
	app-arch/bzip2
25
	>=dev-libs/libxslt-1.1.4
25
	>=dev-libs/libxslt-1.1.4
26
	>=dev-libs/libxml2-2.6.6
26
	>=dev-libs/libxml2-2.6.6
27
	>=dev-libs/libpcre-4.2
27
	>=dev-libs/libpcre-4.2
Lines 30-47 Link Here
30
	arts? ( ~kde-base/arts-1.3.0_beta2 )
30
	arts? ( ~kde-base/arts-1.3.0_beta2 )
31
	cups? ( >=net-print/cups-1.1.19 )
31
	cups? ( >=net-print/cups-1.1.19 )
32
	ldap? ( >=net-nds/openldap-2.1.26 )
32
	ldap? ( >=net-nds/openldap-2.1.26 )
33
	media-libs/tiff
33
	tiff? ( media-libs/tiff )
34
	>=app-admin/fam-2.7.0
34
	>=app-admin/fam-2.7.0
35
	virtual/ghostscript
35
	virtual/ghostscript
36
	media-libs/libart_lgpl
36
	media-libs/libart_lgpl
37
	net-dns/libidn
37
	net-dns/libidn
38
	sys-apps/utempter
38
	sys-devel/gettext
39
	sys-devel/gettext
39
	>=x11-libs/qt-3.3.2"
40
	>=x11-libs/qt-3.3.2"
40
RDEPEND="${DEPEND}
41
RDEPEND="${DEPEND}
41
	app-text/sgml-common
42
	app-text/sgml-common
42
	cups? ( net-print/cups )
43
	cups? ( net-print/cups )
43
	doc? ( app-doc/doxygen )
44
	doc? ( app-doc/doxygen )"
44
	dev-lang/python"
45
45
46
src_unpack() {
46
src_unpack() {
47
	kde_src_unpack
47
	kde_src_unpack
(-)kde-base.orig/kdemultimedia/kdemultimedia-3.3.0_beta2.ebuild (-6 / +6 lines)
Lines 7-22 Link Here
7
DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
7
DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
8
8
9
KEYWORDS="~x86 ~amd64"
9
KEYWORDS="~x86 ~amd64"
10
IUSE="flac encode oggvorbis alsa gstreamer"
10
IUSE="flac speex encode oggvorbis xine alsa"
11
11
12
DEPEND="~kde-base/kdebase-${PV}
12
DEPEND="~kde-base/kdebase-${PV}
13
	media-sound/cdparanoia
13
	media-sound/cdparanoia
14
	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
14
	flac? ( media-libs/flac )
15
	flac? ( media-libs/flac )
16
	speex? ( >=media-libs/speex-1.1.5 )
15
	encode? ( media-sound/lame )
17
	encode? ( media-sound/lame )
16
	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
18
	xine? ( >=media-libs/xine-lib-1_beta12 )
17
	>=media-libs/xine-lib-1_beta12
18
	alsa? ( media-libs/alsa-lib )
19
	alsa? ( media-libs/alsa-lib )
19
	gstreamer? ( media-libs/gstreamer )
20
	media-sound/trm
20
	media-sound/trm
21
	media-libs/taglib
21
	media-libs/taglib
22
	!media-sound/juk"
22
	!media-sound/juk"
Lines 30-45 Link Here
30
	# Still persists with 3.2.1 - kaboodle
30
	# Still persists with 3.2.1 - kaboodle
31
	filter-flags "-fno-default-inline"
31
	filter-flags "-fno-default-inline"
32
32
33
	myconf="$myconf --with-xine-prefix=/usr"
33
	myconf="$myconf --with-xine-prefix=/usr --with-cdparanoia"
34
34
35
	# make -j2 fails, at least on ppc
35
	# make -j2 fails, at least on ppc
36
	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
36
	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
37
	use hppa && append-flags -ffunction-sections
37
	use hppa && append-flags -ffunction-sections
38
38
39
	# alsa 0.9 not supported
40
	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
39
	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
41
	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
40
	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
42
	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
41
	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
42
	use xine 	|| DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
43
43
44
	myconf="$myconf --disable-strict --disable-warnings"
44
	myconf="$myconf --disable-strict --disable-warnings"
45
45
(-)kde-base.orig/kdepim/kdepim-3.3.0_beta2.ebuild (-12 / +4 lines)
Lines 7-30 Link Here
7
DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
7
DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
8
8
9
KEYWORDS="~x86 ~amd64"
9
KEYWORDS="~x86 ~amd64"
10
IUSE="pda crypt ldap"
10
IUSE="pda crypt"
11
11
12
DEPEND="~kde-base/kdenetwork-${PV}
12
DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
13
	pda? ( app-pda/pilot-link dev-libs/libmal )
13
	crypt? ( >=app-crypt/gpgme-0.4.5 )"
14
	ldap? ( net-nds/openldap )
15
	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
16
14
17
src_unpack() {
15
src_unpack() {
18
	kde_src_unpack
16
	kde_src_unpack
19
}
17
}
20
18
21
src_compile() {
19
src_compile() {
22
	use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
20
	use crypt && export GPGME_CONFIG="/usr/bin/gpgme4-config"
23
	kde_src_compile
21
	kde_src_compile
24
}
22
}
25
26
src_install() {
27
	kde_src_install
28
	docinto html
29
	dodoc *.html
30
}

Return to bug 58640