From 1db6a2c5c6b28f84253e69616c4616b949b9fb62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 9 Jun 2006 01:02:18 +0000 Subject: [PATCH] Add new revision of kdelibs without utempter dependency, disabling utempter entirely as kdelibs has its own better code to handle that. Package-Manager: portage-2.1_rc4-r5 --- kde-base/kdelibs/ChangeLog | 9 +- kde-base/kdelibs/Manifest | 21 ++- .../kdelibs/files/digest-kdelibs-3.5.3-r1 | 6 + kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild | 175 ++++++++++++++++++ 4 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 kde-base/kdelibs/files/digest-kdelibs-3.5.3-r1 create mode 100644 kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index d541a47e4996..74e667189ae8 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.339 2006/06/05 22:07:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.340 2006/06/09 01:02:18 flameeyes Exp $ + +*kdelibs-3.5.3-r1 (09 Jun 2006) + + 09 Jun 2006; Diego Pettenò + +kdelibs-3.5.3-r1.ebuild: + Add new revision of kdelibs without utempter dependency, disabling utempter + entirely as kdelibs has its own better code to handle that. 05 Jun 2006; Diego Pettenò kdelibs-3.5.3.ebuild: Apply all the KUbuntu patches for cups 1.2 but the first. Note to self: diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 6780c2da5926..f01f024c1a22 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -73,14 +73,18 @@ EBUILD kdelibs-3.5.2-r6.ebuild 5066 RMD160 ee9cd5496a42758154878ce981e1c294f76db MD5 91679b79ca104a5415368181d0f1e8ca kdelibs-3.5.2-r6.ebuild 5066 RMD160 ee9cd5496a42758154878ce981e1c294f76db1dd kdelibs-3.5.2-r6.ebuild 5066 SHA256 23b64dae702d3e57cd7e513b43a182d33826ab05ade237747e5c07ac77b1424c kdelibs-3.5.2-r6.ebuild 5066 +EBUILD kdelibs-3.5.3-r1.ebuild 5031 RMD160 79bb6c7eb4cfa38faaee4db600b584c70b0a72e2 SHA1 8e1c46da481b5b689adc0478073cab3fa9440b2d SHA256 7ff66d011322466e85f38076240e020cf09a5bbf4d0d6f4636398744e85b3bea +MD5 10bee4286f79fbeb123d4d713db846f2 kdelibs-3.5.3-r1.ebuild 5031 +RMD160 79bb6c7eb4cfa38faaee4db600b584c70b0a72e2 kdelibs-3.5.3-r1.ebuild 5031 +SHA256 7ff66d011322466e85f38076240e020cf09a5bbf4d0d6f4636398744e85b3bea kdelibs-3.5.3-r1.ebuild 5031 EBUILD kdelibs-3.5.3.ebuild 5043 RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 SHA1 e65d14a1fe27e851d6e5e5b6bedf45f05153e1d4 SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c MD5 1adc9ca7dafe1df5175c6864d4bfe13d kdelibs-3.5.3.ebuild 5043 RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 kdelibs-3.5.3.ebuild 5043 SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c kdelibs-3.5.3.ebuild 5043 -MISC ChangeLog 55288 RMD160 b564db5975f78764b1c938d14bef9b2e4c1256a7 SHA1 5c7bd9794220ca70c81fc4aada2b01866a51bf6e SHA256 4b8597166ed61a07e9166f5cb69dd66128d6c927173a19ebbf0d0c59c872e2e1 -MD5 f1850cfa9a0ad7f403316bc9538168e4 ChangeLog 55288 -RMD160 b564db5975f78764b1c938d14bef9b2e4c1256a7 ChangeLog 55288 -SHA256 4b8597166ed61a07e9166f5cb69dd66128d6c927173a19ebbf0d0c59c872e2e1 ChangeLog 55288 +MISC ChangeLog 55543 RMD160 2af9b6a83af11dbf19f725249d98679559a2c38a SHA1 916918a79439f2682d30e8d7ff12b72f84464984 SHA256 913b241b2f8776ca60c62806e72fd8a0cc1c4bc46fc2424b4b553d37d6d3b599 +MD5 47f80654693548db517d375d0cd94c7e ChangeLog 55543 +RMD160 2af9b6a83af11dbf19f725249d98679559a2c38a ChangeLog 55543 +SHA256 913b241b2f8776ca60c62806e72fd8a0cc1c4bc46fc2424b4b553d37d6d3b599 ChangeLog 55543 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -97,10 +101,13 @@ SHA256 4fd83cc3e6a0521a0d7cf3b0d0ce0344830603682c7e5a11fda2350b35c40346 files/di MD5 d22317a98a0074e1c584230ce1c064df files/digest-kdelibs-3.5.3 542 RMD160 12b4a97ab1b824399369046618522313e7020299 files/digest-kdelibs-3.5.3 542 SHA256 1c585fb7eaf1d266043e4000ddc3a22f90350e405c5c804b34c88d968d23ac89 files/digest-kdelibs-3.5.3 542 +MD5 d22317a98a0074e1c584230ce1c064df files/digest-kdelibs-3.5.3-r1 542 +RMD160 12b4a97ab1b824399369046618522313e7020299 files/digest-kdelibs-3.5.3-r1 542 +SHA256 1c585fb7eaf1d266043e4000ddc3a22f90350e405c5c804b34c88d968d23ac89 files/digest-kdelibs-3.5.3-r1 542 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEhKtCAiZjviIA2XgRAlucAKCngbOXaOQ7osYptJnWa2qY3K+zzgCgmOz4 -DXNRoLyDZnl0/pODEWvH7Gs= -=qOIw +iD8DBQFEiMiiAiZjviIA2XgRAjTNAKCY5/r2Qngb7MzFloJ4ErWjlsYy1ACePy/w +BnYgyAHEhTeDJNGBJ0rR4+E= +=mi2X -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r1 new file mode 100644 index 000000000000..c52c0cc1116d --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r1 @@ -0,0 +1,6 @@ +MD5 972c2c6855f912179bd7830bf2ed91d8 kdelibs-3.5.3.tar.bz2 15424888 +RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e545 kdelibs-3.5.3.tar.bz2 15424888 +SHA256 ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 kdelibs-3.5.3.tar.bz2 15424888 +MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 +RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 +SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild new file mode 100644 index 000000000000..fc76720ab42b --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r1.ebuild,v 1.1 2006/06/09 01:02:18 flameeyes Exp $ + +inherit kde flag-o-matic eutils multilib +set-kdedir 3.5 + +DESCRIPTION="KDE libraries needed by all kde programs" +HOMEPAGE="http://www.kde.org/" +SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2 + cups? ( mirror://gentoo/kdeprint-3.5.2-cups-1.2-patches.tar.bz2 )" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff +zeroconf kernel_linux fam" + +# kde.eclass has kdelibs in DEPEND, and we can't have that in here. +# so we recreate the entire DEPEND from scratch. + +# Added aspell-en as dependency to work around bug 131512. +RDEPEND="$(qt_min_version 3.3.3) + arts? ( ~kde-base/arts-${PV} ) + app-arch/bzip2 + >=media-libs/freetype-2 + media-libs/fontconfig + >=dev-libs/libxslt-1.1.15 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libpcre-4.2 + media-libs/libart_lgpl + net-dns/libidn + acl? ( kernel_linux? ( sys-apps/acl ) ) + ssl? ( >=dev-libs/openssl-0.9.7d ) + alsa? ( media-libs/alsa-lib ) + cups? ( >=net-print/cups-1.1.19 ) + tiff? ( media-libs/tiff ) + kerberos? ( virtual/krb5 ) + jpeg2k? ( media-libs/jasper ) + openexr? ( >=media-libs/openexr-1.2 ) + spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) + app-text/ispell ) ) + zeroconf? ( net-misc/mDNSResponder ) + fam? ( virtual/fam ) + virtual/ghostscript" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext + dev-util/pkgconfig" + +RDEPEND="${RDEPEND} + || ( x11-apps/rgb virtual/x11 )" + +PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch + ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch" + +pkg_setup() { + if use legacyssl ; then + echo "" + eerror "Warning:" + ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken" + ewarn "sites, but breaks others instead. It is strongly discouraged to use it." + ewarn "For more information, see bug #128922." + echo "" + fi +} + +src_unpack() { + kde_src_unpack + if use legacyssl ; then + # This patch won't be included upstream, see bug #128922 + epatch ${FILESDIR}/kdelibs-3.5.2-kssl-3des.patch || die "Patch did not apply." + fi + + if use cups && has_version '>=net-print/cups-1.2_pre'; then + cd "${S}" + + EPATCH_EXCLUDE="kubuntu_39_cups12_compile_fixes.diff" \ + EPATCH_SUFFIX="diff" \ + EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/kdeprint-3.5.2-cups-1.2-patches/" + fi +} + +src_compile() { + rm -f ${S}/configure + + # hspell is disabled because it requires version 0.9 of hspell that + # is not in portage yet; leaving it to autodetection tries to use it + # and then fails because of missing required functions + + myconf="--with-distribution=Gentoo + $(use_enable fam libfam) $(use_enable kernel_linux dnotify) + --with-libart --with-libidn --without-utempter + $(use_with acl) $(use_with ssl) + $(use_with alsa) $(use_with arts) + $(use_with kerberos gssapi) $(use_with tiff) + $(use_with jpeg2k jasper) $(use_with openexr) + $(use_enable cups) $(use_enable zeroconf dnssd) + --without-hspell" + + if use spell && has_version app-text/aspell; then + myconf="${myconf} --with-aspell" + else + myconf="${myconf} --without-aspell" + fi + + if has_version x11-apps/rgb; then + myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" + fi + + myconf="${myconf} --disable-fast-malloc" + + # fix bug 58179, bug 85593 + # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a + # closer look... - corsair + use ppc64 && append-flags "-mminimal-toc" + + # work around bug #120858, gcc 3.4.x -Os miscompilation + use x86 && replace-flags "-Os" "-O2" # see bug #120858 + + export BINDNOW_FLAGS="$(bindnow-flags)" + + kde_src_compile + + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + # Needed to create lib -> lib64 symlink for amd64 2005.0 profile + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib + fi + + if ! use arts ; then + dodir /etc/env.d + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:${PREFIX}/${libdir}" + done + + cat < ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade +PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin +LDPATH=${libdirs:1} +CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" +EOF + fi + +} + +pkg_postinst() { + if use zeroconf; then + echo + einfo "To make zeroconf support available in KDE" + einfo "make sure that the 'mdnsd' daemon is running." + einfo "Make sure also that multicast dns lookups are" + einfo "enabled by editing the 'hosts:' line in" + einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" + einfo "hosts: files mdns dns" + echo + fi +} -- 2.26.2