diff options
author | Carsten Lohrke <carlo@gentoo.org> | 2005-03-04 11:38:57 +0000 |
---|---|---|
committer | Carsten Lohrke <carlo@gentoo.org> | 2005-03-04 11:38:57 +0000 |
commit | 7cb07b7ee4d4266dc556a3ee079772cf6b9f80db (patch) | |
tree | 8ab8ab6baef16bd10ec9b5497c9aa5c4e459f1b8 /kde-base | |
parent | fixed a typo which broke postgresql support and changed xml-commons dependenc... (diff) | |
download | gentoo-2-7cb07b7ee4d4266dc556a3ee079772cf6b9f80db.tar.gz gentoo-2-7cb07b7ee4d4266dc556a3ee079772cf6b9f80db.tar.bz2 gentoo-2-7cb07b7ee4d4266dc556a3ee079772cf6b9f80db.zip |
patch wasn't correct
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdelibs/Manifest | 8 | ||||
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.2.3-r7 | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.3.2-r5 | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kde3-dcopidlng.patch | 2 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild | 100 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.3.2-r5.ebuild | 118 |
7 files changed, 234 insertions, 4 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index e798b281e407..8ace01d4c32f 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # 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.203 2005/03/03 15:51:54 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.204 2005/03/04 11:38:57 carlo Exp $ + +*kdelibs-3.2.3-r7 (04 Mar 2005) + + 04 Mar 2005; Carsten Lohrke <carlo@gentoo.org> files/kde3-dcopidlng.patch, + +kdelibs-3.2.3-r7.ebuild, +kdelibs-3.3.2-r5.ebuild: + patch wasn't correct 03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> kdelibs-3.3.2-r4.ebuild: diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 9aa6b504c85c..666a9113c898 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -5,10 +5,12 @@ MD5 a269dba5d66751563def52ffa62c65f5 kdelibs-3.3.2-r4.ebuild 3348 MD5 fcbbc60f31a8a5ec853b401b5a058e9d kdelibs-3.4.0_beta2.ebuild 2701 MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986 MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940 +MD5 87262da4160ac237dba08afd12fe3d7e kdelibs-3.2.3-r7.ebuild 3006 MD5 e9880699449565ce112cfb096a2b73bf kdelibs-3.3.2-r3.ebuild 3291 MD5 ea27e399daaad758dcac0697981f3584 kdelibs-3.4.0_beta1.ebuild 2813 -MD5 ddfbbdc11bc7abe2d17b933c2b27f49f ChangeLog 32918 +MD5 5d5731a4736a2a9dcb4aed9e55a8a4d8 ChangeLog 33106 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 +MD5 3006feb087f43b4ce332ca93111b34df kdelibs-3.3.2-r5.ebuild 3351 MD5 e5285c7be708bc634b61a720515f2091 files/kdelibs-3.4.0_beta2-export-symbols-for-bindings.diff 5733 MD5 1c47f3fafa13fcf69ce4cb1c474f5643 files/digest-kdelibs-3.4.0_beta1 69 MD5 c4a839a9c3a59950aa5e8db4e312d219 files/digest-kdelibs-3.4.0_beta2 69 @@ -17,7 +19,7 @@ MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324 MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751 MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549 MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384 -MD5 8f3415e54bcf395b0db488c93410b377 files/kde3-dcopidlng.patch 672 +MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681 MD5 29bcfee4f3cecd8529fa92ce4caba53c files/digest-kdelibs-3.4.0_rc1-r1 72 MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989 @@ -35,7 +37,9 @@ MD5 054d042dcbccec0be386a2d26d30a5b1 files/reference-list-rev-1.3.diff 526 MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315 MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68 MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r6 68 +MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r7 68 MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68 MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68 MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r3 68 MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r4 68 +MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r5 68 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r7 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r7 new file mode 100644 index 000000000000..ab94bd8ba7fd --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r7 @@ -0,0 +1 @@ +MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r5 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r5 new file mode 100644 index 000000000000..bc59a2da5ef1 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r5 @@ -0,0 +1 @@ +MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180 diff --git a/kde-base/kdelibs/files/kde3-dcopidlng.patch b/kde-base/kdelibs/files/kde3-dcopidlng.patch index 0535454d3b73..91da2ec97902 100644 --- a/kde-base/kdelibs/files/kde3-dcopidlng.patch +++ b/kde-base/kdelibs/files/kde3-dcopidlng.patch @@ -3,7 +3,7 @@ @@ -1,13 +1,15 @@ #!/bin/sh + -+trap "rm -f dcopidlng.stderr.$$" ++trap "rm -f dcopidlng.stderr.$$" 0 1 2 15 + if test -z "$KDECONFIG"; then KDECONFIG=kde-config diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild new file mode 100644 index 000000000000..bb1f7fe003ee --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild @@ -0,0 +1,100 @@ +# 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.2.3-r7.ebuild,v 1.1 2005/03/04 11:38:57 carlo Exp $ + +inherit kde eutils + +need-autoconf 2.5 +set-kdedir ${PV} + +DESCRIPTION="KDE libraries needed by all kde programs" +HOMEPAGE="http://www.kde.org/" +SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86" +IUSE="alsa cups ipv6 ssl doc ldap" + +# 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-1.0.2 + >=dev-libs/libxslt-1.0.31 + >=dev-libs/libxml2-2.5.8 + >=dev-libs/libpcre-3.9 + ssl? ( >=dev-libs/openssl-0.9.6k ) + alsa? ( media-libs/alsa-lib virtual/alsa ) + cups? ( >=net-print/cups-1.1.19 ) + ldap? ( >=net-nds/openldap-2.0.25 ) + media-libs/tiff + >=app-admin/fam-2.6.10 + virtual/ghostscript + media-libs/libart_lgpl + sys-devel/gettext + ~kde-base/arts-1.2.3 + >=x11-libs/qt-3.2.3" +RDEPEND="${DEPEND} + app-text/sgml-common + cups? ( net-print/cups ) + doc? ( app-doc/doxygen ) + dev-lang/python" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.2.3-kdelibs-kcookiejar.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-kstandarddirs.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes2.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-kio.diff + epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff + epatch ${FILESDIR}/post-3.2.3-kdelibs-kioslave.patch + epatch ${FILESDIR}/kde3-dcopidlng.patch + cd ${S}/dcop && patch -p0 < ${FILESDIR}/post-3.2.3-kdelibs-dcopserver.patch + cd ${S} + make -f admin/Makefile.common || die +} + +src_compile() { + kde_src_compile myconf + + myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" + myconf="$myconf `use_with alsa` `use_enable cups`" + + use ipv6 || myconf="$myconf --with-ipv6-lookup=no" + use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" + use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" + use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" + + use x86 && myconf="$myconf --enable-fast-malloc=full" + + kde_src_compile configure make + + use doc && make apidox +} + +src_install() { + kde_src_install + dohtml *.html + + if use doc ; then + einfo "Copying API documentation..." + dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs + cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs + else + rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs + fi + + # needed to fix lib64 issues on amd64, see bug #45669 + use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64 + +} + +pkg_postinst() { + if use doc ; then + rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common + ln -sf $KDEDIR/share/doc/HTML/en/common \ + $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common + fi +} diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r5.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r5.ebuild new file mode 100644 index 000000000000..c566d46c3be4 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.3.2-r5.ebuild @@ -0,0 +1,118 @@ +# 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.3.2-r5.ebuild,v 1.1 2005/03/04 11:38:57 carlo Exp $ + +inherit kde eutils flag-o-matic +set-kdedir 3.3 + +DESCRIPTION="KDE libraries needed by all kde programs" +HOMEPAGE="http://www.kde.org/" +SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.3" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~alpha" +IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff" + +# 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-1.3.2 ) + >=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 + ssl? ( >=dev-libs/openssl-0.9.7d ) + alsa? ( media-libs/alsa-lib virtual/alsa ) + cups? ( >=net-print/cups-1.1.19 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + tiff? ( media-libs/tiff ) + spell? ( || ( app-text/aspell + app-text/ispell ) ) + kerberos? ( virtual/krb5 ) + virtual/fam + virtual/ghostscript + media-libs/libart_lgpl + net-dns/libidn + sys-devel/gettext" + +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.58 + >=sys-devel/automake-1.8 + doc? ( app-doc/doxygen ) + !kde-misc/kgamma" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.3.2-kdelibs-kio.diff + epatch ${FILESDIR}/post-3.3.2-kdelibs-htmlframes2.patch + epatch ${FILESDIR}/post-3.3.2-kdelibs-kioslave.patch + + # see bug #67748. Patch applied in kdelibs 3.4.x. + epatch ${FILESDIR}/${P}-aspell-dir.patch + + # see bug #77127. Patch applied in kdelibs 3.3.3. + epatch ${FILESDIR}/${P}-anchor-fix.patch + + # see bug #81652. + epatch ${FILESDIR}/kde3-dcopidlng.patch +} + +src_compile() { + kde_src_compile myconf + + myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" + myconf="$myconf $(use_with alsa) $(use_enable cups) $(use_with arts)" + + use ipv6 || myconf="$myconf --with-ipv6-lookup=no" + use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" + + use kerberos || myconf="$myconf --with-gssapi=no" + + use x86 && myconf="$myconf --enable-fast-malloc=full" + use ppc64 && append-flags -mminimal-toc + + kde_src_compile configure make + + use doc && make apidox +} + +src_install() { + kde_src_install + dohtml *.html + + if use doc ; then + einfo "Copying API documentation..." + dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs + cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs + else + rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs + 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 + + echo "PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin +LDPATH=${PREFIX}/lib +CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/47kdepaths-3.3.1 # number goes down with version upgrade + + fi + +} + +pkg_postinst() { + if use doc ; then + rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common + ln -sf $KDEDIR/share/doc/HTML/en/common \ + $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common + fi +} |