Add patch to properly respect USE flags (#81966). Fix #82220. Better support for amd64 multilib (#94872).

(Portage version: 2.0.51.19)

4 files changed, 246 insertions, 1 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 131272dfe36c..cfe84a42f8f8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.245 2005/05/28 20:41:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.246 2005/06/07 12:59:02 greg_g Exp $
+
+*kdelibs-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.4.1-configure.patch, +kdelibs-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966). Fix #82220. Better support
+  for amd64 multilib (#94872).
 
   28 May 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.1.ebuild:
   switched from -fno-gcse to -mminimal-toc, to let this compile on ppc64
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1
new file mode 100644
index 000000000000..2752395bb81a
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1
@@ -0,0 +1 @@
+MD5 67224e6b55856c23b0a162cab17dd1b4 kdelibs-3.4.1.tar.bz2 16853777
diff --git a/kde-base/kdelibs/files/kdelibs-3.4.1-configure.patch b/kde-base/kdelibs/files/kdelibs-3.4.1-configure.patch
new file mode 100644
index 000000000000..f8e99209b988
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.4.1-configure.patch
@@ -0,0 +1,118 @@
+diff -Nur kdelibs-3.4.1.orig/configure.in.in kdelibs-3.4.1/configure.in.in
+--- kdelibs-3.4.1.orig/configure.in.in	2005-05-23 14:17:19.000000000 +0200
++++ kdelibs-3.4.1/configure.in.in	2005-06-05 21:10:19.000000000 +0200
+@@ -324,11 +324,19 @@
+ AC_DEFINE_UNQUOTED(KDE_DISTRIBUTION_TEXT, "$kde_distribution_text", [Distribution Text to append to OS])
+ AC_MSG_RESULT($kde_distribution_text)
+ 
+-kde_have_utempter=yes
+-AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+-AC_SUBST(LIBUTEMPTER)
+-if test "$kde_have_utempter" = "yes"; then
+-  AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
++AC_ARG_WITH(utempter,
++[AS_HELP_STRING([--with-utempter], [use utempter for utmp management @<:@default=check@:>@])],
++[], with_utempter=check)
++if test "x$with_utempter" != xno; then
++  kde_have_utempter=yes
++  AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
++  AC_SUBST(LIBUTEMPTER)
++  if test "$kde_have_utempter" = "yes"; then
++    AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
++  fi
++  if test "x$with_utempter" != xcheck && test "x$kde_have_utempter" != xyes; then
++    AC_MSG_FAILURE([--with-utempter was given, but test for utempter failed])
++  fi
+ fi
+ 
+ KDE_INIT_DOXYGEN([The KDE API Reference], [Version $VERSION])
+diff -Nur kdelibs-3.4.1.orig/kdecore/configure.in.in kdelibs-3.4.1/kdecore/configure.in.in
+--- kdelibs-3.4.1.orig/kdecore/configure.in.in	2005-05-23 14:16:21.000000000 +0200
++++ kdelibs-3.4.1/kdecore/configure.in.in	2005-06-05 21:10:32.000000000 +0200
+@@ -42,12 +42,21 @@
+ dnl Test for libidn (IDNA support)
+ dnl -------
+ 
++AC_ARG_WITH(libidn,
++  [AS_HELP_STRING(--with-libidn,
++    [enable support for libidn @<:@default=check@:>@])],
++  [], with_libidn=check)
+ LIB_IDN=
+-KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
+-  AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
+-  LIB_IDN=-lidn
+-])
+-AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
++if test "x$with_libidn" != xno; then
++  AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
++  KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
++    AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
++    LIB_IDN=-lidn
++  ])
++  if test "x$with_libidn" != xcheck && test -z "$LIB_IDN"; then
++    AC_MSG_FAILURE([--with-libidn was given, but test for libidn failed])
++  fi
++fi
+ AC_SUBST(LIB_IDN)
+ 
+ dnl --------
+@@ -164,30 +173,40 @@
+ 
+ SVGICONS=
+ 	
+-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
+-  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+-])
+-
+-if test -n "$LIBART_CONFIG"; then
+-  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+-  if test -n "$vers" && test "$vers" -ge 2003008
+-  then
+-     LIBART_LIBS="`$LIBART_CONFIG --libs`"
+-     LIBART_RPATH=
+-     for args in $LIBART_LIBS; do
++AC_ARG_WITH(libart,
++  [AS_HELP_STRING(--with-libart,
++    [enable support for libart @<:@default=check@:>@])],
++  [], with_libart=check)
++
++if test "x$with_libart" != xno; then
++  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
++    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
++  ])
++
++  if test -n "$LIBART_CONFIG"; then
++    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++    if test -n "$vers" && test "$vers" -ge 2003008
++    then
++      LIBART_LIBS="`$LIBART_CONFIG --libs`"
++      LIBART_RPATH=
++      for args in $LIBART_LIBS; do
+ 	  case $args in
+ 	    -L*)
+   	       LIBART_RPATH="$LIBART_RPATH $args"
+  	       ;;
+           esac
+-     done
+-     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+-     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-     SVGICONS=svgicons
+-
+-     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+-  else
+-     AC_MSG_WARN([You need at least libart 2.3.8])
++      done
++      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++      SVGICONS=svgicons
++
++      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
++    else
++      AC_MSG_WARN([You need at least libart 2.3.8])
++    fi
++  fi
++  if test "x$with_libart" != xcheck && test -z "$LIBART_LIBS"; then
++    AC_MSG_FAILURE([--with-libart was given, but test for libart failed])
+   fi
+ fi
+ 
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..6593035dde11
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.1 2005/06/07 12:59:02 greg_g Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-qtdir 3
+set-kdedir 3.4
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.4"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+RDEPEND="arts? ( ~kde-base/arts-${PV} )
+	>=x11-libs/qt-3.3.3
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	sys-apps/utempter
+	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-text/ispell ) )
+	zeroconf? ( net-misc/mDNSResponder )
+	virtual/fam
+	virtual/ghostscript"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/${P}-configure.patch"
+
+	# for the configure patch
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	myconf="--with-distribution=Gentoo
+	        --enable-libfam $(use_enable kernel_linux dnotify)
+	        --with-libart --with-libidn --with-utempter
+	        $(use_with alsa) $(use_with arts) $(use_with ssl)
+	        $(use_with kerberos gssapi) $(use_with tiff)
+	        $(use_with jpeg2k jasper) $(use_with openexr)
+	        $(use_enable cups) $(use_enable zeroconf dnssd)"
+
+	if use spell && has_version app-text/aspell; then
+		myconf="${myconf} --with-aspell"
+	else
+		myconf="${myconf} --without-aspell"
+	fi
+
+	use x86 && myconf="${myconf} --enable-fast-malloc=full"
+
+	# 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"
+
+	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 fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+
+	# 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 <<EOF > ${D}/etc/env.d/46kdepaths-${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
+
+}