diff options
| -rw-r--r-- | kde-base/kdebase/files/digest-kdebase-2.2 | 1 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-2.2.ebuild | 25 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-2.2.ebuild | 8 | ||||
| -rw-r--r-- | profiles/package.mask | 3 | ||||
| -rw-r--r-- | sys-apps/portage/files/1.5/cnf/make.conf | 2 | ||||
| -rw-r--r-- | x11-libs/qt-x11/files/digest-qt-x11-2.3.1 | 1 | ||||
| -rw-r--r-- | x11-libs/qt-x11/qt-x11-2.3.1.ebuild | 19 |
7 files changed, 45 insertions, 14 deletions
diff --git a/kde-base/kdebase/files/digest-kdebase-2.2 b/kde-base/kdebase/files/digest-kdebase-2.2 index d56e3cb8d5e5..6709c733ea58 100644 --- a/kde-base/kdebase/files/digest-kdebase-2.2 +++ b/kde-base/kdebase/files/digest-kdebase-2.2 @@ -1 +1,2 @@ +MD5 67a29b76d24cb394aff9fd8a7f68f34e kde-admin-acinclude.patch MD5 15e0232aa73029ac10346157b6eb079b kdebase-2.2.tar.bz2 diff --git a/kde-base/kdebase/kdebase-2.2.ebuild b/kde-base/kdebase/kdebase-2.2.ebuild index d329fc86ec42..4e3b2132a982 100644 --- a/kde-base/kdebase/kdebase-2.2.ebuild +++ b/kde-base/kdebase/kdebase-2.2.ebuild @@ -1,16 +1,17 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.ebuild,v 1.4 2001/08/17 23:31:05 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.ebuild,v 1.5 2001/08/21 23:54:43 danarmak Exp $ V=${PV} -A=${PN}-${V}.tar.bz2 +#A=${PN}-${V}.tar.bz2 S=${WORKDIR}/${PN}-${V} DESCRIPTION="KDE ${V} - Base" -SRC_PATH="kde/stable/${V}/src/${A}" +SRC_PATH="kde/stable/${V}/src/${P}.tar.bz2" SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" + ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH + http://www.research.att.com/~leonb/objprelink/kde-admin-acinclude.patch" HOMEPAGE="http://www.kde.org/" DEPEND=">=kde-base/kdelibs-${PV} @@ -21,7 +22,17 @@ DEPEND=">=kde-base/kdelibs-${PV} lame? ( =media-sound/lame-3.88b-r1 ) vorbis? ( >=media-libs/libvorbis-1.0_beta1 ) cups? ( net-print/cups ) - ssl? ( dev-libs/openssl )" + ssl? ( dev-libs/openssl ) + objprelink? ( dev-util/objprelink )" + +src_unpack() { + + cd ${WORKDIR} + unpack ${P}.tar.bz2 + cd ${S} + use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch + +} src_compile() { local myconf @@ -70,6 +81,10 @@ src_compile() { if [ -z "`use ssl`" ] ; then myconf="$myconf --without-ssl" fi + + if [ "`use objprelink`" ] ; then + myconf="$myconf --enable-objprelink" + fi QTBASE=/usr/X11R6/lib/qt # export CFLAGS="${CFLAGS} -I/usr/X11R6/include" diff --git a/kde-base/kdelibs/kdelibs-2.2.ebuild b/kde-base/kdelibs/kdelibs-2.2.ebuild index f09d6b67d7e8..882810efe198 100644 --- a/kde-base/kdelibs/kdelibs-2.2.ebuild +++ b/kde-base/kdelibs/kdelibs-2.2.ebuild @@ -10,7 +10,8 @@ DESCRIPTION="KDE ${PV} - libs" SRC_PATH="kde/stable/${V}/src/${A}" SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" + ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH + http://www.research.att.com/~leonb/objprelink/kde-admin-acinclude.patch" HOMEPAGE="http://www.kde.org/" @@ -23,6 +24,7 @@ DEPEND=">=sys-devel/gcc-2.95.2 sys-devel/perl ssl? ( >=dev-libs/openssl-0.9.6 ) alsa? ( >=media-libs/alsa-lib-0.5.9 ) cups? ( net-print/cups ) + objprelink? ( dev-util/objprelink ) sys-devel/autoconf" RDEPEND=">=sys-devel/gcc-2.95.2 @@ -41,6 +43,7 @@ RDEPEND=">=sys-devel/gcc-2.95.2 src_unpack() { unpack ${A} cd ${S} + use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch # patch -p0 < ${FILESDIR}/${PN}-2.1.1-ksgmltools-gentoo.diff # rm configure # autoconf @@ -71,6 +74,9 @@ src_compile() { if [ -z "`use ipv6`" ] ; then myopts="$myopts --with-ipv6-lookup=no" fi + + use onjprelink && myopts="$myopts --enable-objprelink" + try ./configure --prefix=/opt/kde${V} --host=${CHOST} \ --with-qt-dir=$QTBASE $myopts --with-xinerama \ --disable-libfam diff --git a/profiles/package.mask b/profiles/package.mask index b9db8099d7f0..05d08abc1b25 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,3 +1,6 @@ +#experimental objprelink, used by qt/kde, may be unstable +dev-util/objprelink + #moved away kde-apps/cervisia kde-apps/kbear diff --git a/sys-apps/portage/files/1.5/cnf/make.conf b/sys-apps/portage/files/1.5/cnf/make.conf index 8833ee98957e..094944ee13be 100644 --- a/sys-apps/portage/files/1.5/cnf/make.conf +++ b/sys-apps/portage/files/1.5/cnf/make.conf @@ -18,7 +18,7 @@ # Other experimental/unstable flags # --------------------------------- # directfb gd ungif gtkhtml socks5 pdflib qt-embedded jfs -# mta-tls mta-ldap mta-mysql +# mta-tls mta-ldap mta-mysql objprelink # # Other build related use flags # ----------------------------- diff --git a/x11-libs/qt-x11/files/digest-qt-x11-2.3.1 b/x11-libs/qt-x11/files/digest-qt-x11-2.3.1 index f69b8af44d68..80b6a581c27e 100644 --- a/x11-libs/qt-x11/files/digest-qt-x11-2.3.1 +++ b/x11-libs/qt-x11/files/digest-qt-x11-2.3.1 @@ -1 +1,2 @@ +MD5 54ea141dc13ba9fca00d0202429f6ec9 qt-configs.patch MD5 358d6dfbcbdc353b65b5236866b0f3a7 qt-x11-2.3.1.tar.gz diff --git a/x11-libs/qt-x11/qt-x11-2.3.1.ebuild b/x11-libs/qt-x11/qt-x11-2.3.1.ebuild index 4edaacbc65a1..a7d01cc2b156 100644 --- a/x11-libs/qt-x11/qt-x11-2.3.1.ebuild +++ b/x11-libs/qt-x11/qt-x11-2.3.1.ebuild @@ -1,27 +1,32 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Philippe Namias <pnamias@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.3.1.ebuild,v 1.3 2001/08/21 23:54:43 danarmak Exp $ -A=${P}.tar.gz S=${WORKDIR}/qt-${PV} -DESCRIPTION="QT 2.2" -SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}" -HOMEPAGE="http://www.kde.org/" +DESCRIPTION="QT ${PV}" +SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${P}.tar.gz \ +http://www.research.att.com/~leonb/objprelink/qt-configs.patch" +HOMEPAGE="http://www.trolltech.com/" DEPEND=">=media-libs/libpng-1.0.9 >=media-libs/libmng-1.0.0 opengl? ( virtual/opengl virtual/glu ) nas? ( >=media-sound/nas-1.4.1 ) + objprelink? ( dev-util/objprelink ) virtual/x11" export QTDIR=${S} src_unpack() { - unpack ${A} + unpack ${P}.tar.gz cd ${S} cp configure configure.orig sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure + if [ "`use objprelink`" ] + then + patch -p0 < ${DISTDIR}/qt-configs.patch + fi } src_compile() { @@ -52,7 +57,7 @@ src_compile() { else myconf="${myconf} -release" fi - + try SYSCONF_CFLAGS="$CFLAGS" SYSCONF_CXXFLAGS="$CXXFLAGS" \ ./configure -sm -thread -system-zlib -system-jpeg ${myconf} \ -system-libmng -system-libpng -gif -platform linux-g++ \ |