From: Diego Elio Pettenò Date: Fri, 17 Nov 2006 18:36:35 +0000 (+0000) Subject: Add new version, that with avahi useflag use kde-misc/kdnssd-avahi rather tha buildin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b6f120433bb8b20180d30803944c74465e4ecbc;p=gentoo.git Add new version, that with avahi useflag use kde-misc/kdnssd-avahi rather tha building the internal kdnssd support. Thanks to Nathan Caldwell in bug #118178. Package-Manager: portage-2.1.2_rc1-r7 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 9b41152a2032..522ae3e4f356 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,15 @@ # 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.383 2006/11/16 13:29:01 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.384 2006/11/17 18:36:35 flameeyes Exp $ + +*kdelibs-3.5.5-r6 (17 Nov 2006) + + 17 Nov 2006; Diego Pettenò + kdelibs-3.5.2-r6.ebuild, kdelibs-3.5.5-r4.ebuild, kdelibs-3.5.5-r5.ebuild, + +kdelibs-3.5.5-r6.ebuild: + Add new version, that with avahi useflag use kde-misc/kdnssd-avahi rather + tha building the internal kdnssd support. Thanks to Nathan Caldwell in bug + #118178. 16 Nov 2006; Joseph Jezak kdelibs-3.5.5-r4.ebuild: Marked ppc stable for bug #147570. diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 5216758444cd..2492b0c06a34 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 SHA1 102b786b497b61e6bce22c67f2b505aaea6b5b03 SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681 @@ -66,10 +69,10 @@ DIST kdelibs-3.5.3.tar.bz2 15424888 RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e DIST kdelibs-3.5.4.tar.bz2 15450025 RMD160 a80ce24ee485bcfc7f2f06c3a798401b3188670d SHA1 766d7579917e0296faf81f45a07ad1d9263afb6c SHA256 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 DIST kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 RMD160 acd244fad5168ddf683dc988e7d51607641acd47 SHA1 084e9b9fcb156699b6a1f576455aba561df5d1fa SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 -EBUILD kdelibs-3.5.2-r6.ebuild 5108 RMD160 7e45f435a3117dbac2855477cddca19d994e9b1e SHA1 5fd874a3dcc43e2c321c9769ec3b15b09749dce8 SHA256 2f2e1ffb9eefb9c26274e07c8d8e7b992979738600fc2f65ae39bec2c738a511 -MD5 69067089b05acb276aa24043a104fe8e kdelibs-3.5.2-r6.ebuild 5108 -RMD160 7e45f435a3117dbac2855477cddca19d994e9b1e kdelibs-3.5.2-r6.ebuild 5108 -SHA256 2f2e1ffb9eefb9c26274e07c8d8e7b992979738600fc2f65ae39bec2c738a511 kdelibs-3.5.2-r6.ebuild 5108 +EBUILD kdelibs-3.5.2-r6.ebuild 5141 RMD160 cd3639056c3bc79c1fdac420647a44ff781dd929 SHA1 df37856e6ad1574b3af2230d59b51afd61943609 SHA256 08986fcb4cadf1d73dae6793967a05ef55dff2e49348be1b4dfc32bcb6dddd46 +MD5 622903642a5eb66facef712effc0f44a kdelibs-3.5.2-r6.ebuild 5141 +RMD160 cd3639056c3bc79c1fdac420647a44ff781dd929 kdelibs-3.5.2-r6.ebuild 5141 +SHA256 08986fcb4cadf1d73dae6793967a05ef55dff2e49348be1b4dfc32bcb6dddd46 kdelibs-3.5.2-r6.ebuild 5141 EBUILD kdelibs-3.5.3-r4.ebuild 4955 RMD160 f9a3b20ebf796d8f6f12bd117aa83debc909f712 SHA1 21eba7a27a9e2372ca7996cd2edaecebf1d20631 SHA256 425a3f44d70e135946ad858d4331a62e61c51b629525be73dd2f2f1c11a5c06e MD5 027ddefe8466493361fafb420debfd8b kdelibs-3.5.3-r4.ebuild 4955 RMD160 f9a3b20ebf796d8f6f12bd117aa83debc909f712 kdelibs-3.5.3-r4.ebuild 4955 @@ -82,22 +85,26 @@ EBUILD kdelibs-3.5.4-r4.ebuild 5160 RMD160 772e4cbef84cc9d78ab1736ac2f202c37e433 MD5 4d6d7acb81528b92c639fa2d7e5de7e6 kdelibs-3.5.4-r4.ebuild 5160 RMD160 772e4cbef84cc9d78ab1736ac2f202c37e4331da kdelibs-3.5.4-r4.ebuild 5160 SHA256 5a1ccb04100e059486100ec648d3add2c6fe42d38ba37e93e20864bb631f222e kdelibs-3.5.4-r4.ebuild 5160 -EBUILD kdelibs-3.5.5-r4.ebuild 5320 RMD160 6c5462ae852b2281657d66335ceac8b97517f148 SHA1 25a7d1d39d888c90eed0ca4f58dc2bf37279a3af SHA256 8f5dfdff09472fc3ae547bd4c87ce84496ef7a35be722ac113033aaaeb589b57 -MD5 5766f15a424ef2a7df8badbfe343abac kdelibs-3.5.5-r4.ebuild 5320 -RMD160 6c5462ae852b2281657d66335ceac8b97517f148 kdelibs-3.5.5-r4.ebuild 5320 -SHA256 8f5dfdff09472fc3ae547bd4c87ce84496ef7a35be722ac113033aaaeb589b57 kdelibs-3.5.5-r4.ebuild 5320 -EBUILD kdelibs-3.5.5-r5.ebuild 5453 RMD160 8c5f4b90c2d1ed6519e72e44913974cef21b21e9 SHA1 c3d2ba476ab789315e016aab489e2780ab529e5c SHA256 fd531f2108a49345c39240a90f31fcf571480c6da14c160a068d00c4a9451a25 -MD5 2a6a445a0f999094eb196431e413ac2c kdelibs-3.5.5-r5.ebuild 5453 -RMD160 8c5f4b90c2d1ed6519e72e44913974cef21b21e9 kdelibs-3.5.5-r5.ebuild 5453 -SHA256 fd531f2108a49345c39240a90f31fcf571480c6da14c160a068d00c4a9451a25 kdelibs-3.5.5-r5.ebuild 5453 +EBUILD kdelibs-3.5.5-r4.ebuild 5352 RMD160 72ce579e4585a37a34dc297e602514c89dfb801e SHA1 c965d66577d34bada52b1d3539de4471bfbbb933 SHA256 1d63c94ec92c63ed6d486f1a52ab1e2b683f1a6657231ff3b867cae5be363f64 +MD5 570b9553f4c360642cbe83b0098ecd03 kdelibs-3.5.5-r4.ebuild 5352 +RMD160 72ce579e4585a37a34dc297e602514c89dfb801e kdelibs-3.5.5-r4.ebuild 5352 +SHA256 1d63c94ec92c63ed6d486f1a52ab1e2b683f1a6657231ff3b867cae5be363f64 kdelibs-3.5.5-r4.ebuild 5352 +EBUILD kdelibs-3.5.5-r5.ebuild 5487 RMD160 397b44f923cf89c7146c1029e1294ead6d0b46d5 SHA1 3a85b55e60c2e7784ce8bf54c3e0bc6a44dc0d21 SHA256 2259a06d83f307b880f31e352910d7b3ccbd6360ec4a1e968099bc225913af05 +MD5 314b63520ee363f5ba5480dec8feba6d kdelibs-3.5.5-r5.ebuild 5487 +RMD160 397b44f923cf89c7146c1029e1294ead6d0b46d5 kdelibs-3.5.5-r5.ebuild 5487 +SHA256 2259a06d83f307b880f31e352910d7b3ccbd6360ec4a1e968099bc225913af05 kdelibs-3.5.5-r5.ebuild 5487 +EBUILD kdelibs-3.5.5-r6.ebuild 5605 RMD160 55cfac3d5069e317c15e5b77849ebad412eeb7c5 SHA1 3d1acd13218b6282fc1c15186a5e36148dd5566c SHA256 3a6e704a4604b473a3e8d154e9e4c00439edc17f01b6c84ba533aed0b859fc26 +MD5 01a2facb72213b6a4f08afb0862abc8a kdelibs-3.5.5-r6.ebuild 5605 +RMD160 55cfac3d5069e317c15e5b77849ebad412eeb7c5 kdelibs-3.5.5-r6.ebuild 5605 +SHA256 3a6e704a4604b473a3e8d154e9e4c00439edc17f01b6c84ba533aed0b859fc26 kdelibs-3.5.5-r6.ebuild 5605 EBUILD kdelibs-3.5.5.ebuild 5226 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 SHA1 47579463860ce4d0ddfc1bbd996e1a6b827583a3 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938 MD5 973be63836556a69d870bcb58d7ca9eb kdelibs-3.5.5.ebuild 5226 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 kdelibs-3.5.5.ebuild 5226 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938 kdelibs-3.5.5.ebuild 5226 -MISC ChangeLog 63086 RMD160 68cc2cfb66e86eeb135c2dde8a5e973ec372e0fd SHA1 60a64f02b85c7badfde4659dcaa74f8f2b413b57 SHA256 9df59ca88264cf148d602da10cf6b32a7cec016628680a5caad92677126cc63b -MD5 7cf3a8caa9e7ab132a1d6d34e752d94e ChangeLog 63086 -RMD160 68cc2cfb66e86eeb135c2dde8a5e973ec372e0fd ChangeLog 63086 -SHA256 9df59ca88264cf148d602da10cf6b32a7cec016628680a5caad92677126cc63b ChangeLog 63086 +MISC ChangeLog 63446 RMD160 7932c51303969d81e1c7adb11ce7b47245b0ef87 SHA1 974c654cbfdc96e47e5198810eb77f62386d0896 SHA256 f008e21d0bcdb3c1ffe9ac1e5e9574ba6dacbcba705a19296afaf271d2970b10 +MD5 e1d483c36e63ee05369dfb22c3417a3d ChangeLog 63446 +RMD160 7932c51303969d81e1c7adb11ce7b47245b0ef87 ChangeLog 63446 +SHA256 f008e21d0bcdb3c1ffe9ac1e5e9574ba6dacbcba705a19296afaf271d2970b10 ChangeLog 63446 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -123,3 +130,13 @@ SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/di MD5 4e084c981a53be48eb4df82f46649e60 files/digest-kdelibs-3.5.5-r5 521 RMD160 b35a8ed3374893328cf91746946b98d833051692 files/digest-kdelibs-3.5.5-r5 521 SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/digest-kdelibs-3.5.5-r5 521 +MD5 4e084c981a53be48eb4df82f46649e60 files/digest-kdelibs-3.5.5-r6 521 +RMD160 b35a8ed3374893328cf91746946b98d833051692 files/digest-kdelibs-3.5.5-r6 521 +SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/digest-kdelibs-3.5.5-r6 521 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFXgG3AiZjviIA2XgRApqWAJ9nx3U3DB9RYz82RO9aN9hgLqLf6wCgo1nG +nF/rBypL1aHZulH9hvvLiZQ= +=pvGg +-----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r6 b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r6 new file mode 100644 index 000000000000..79c37c4a8348 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r6 @@ -0,0 +1,6 @@ +MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423 +RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423 +SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423 +MD5 2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 15486690 +RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 kdelibs-3.5.5.tar.bz2 15486690 +SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 kdelibs-3.5.5.tar.bz2 15486690 diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild index a4d24e56fb92..ed750cb20b54 100644 --- a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild @@ -1,6 +1,6 @@ # 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.2-r6.ebuild,v 1.15 2006/09/18 16:17:49 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.16 2006/11/17 18:36:35 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -40,7 +40,7 @@ RDEPEND="$(qt_min_version 3.3.3) openexr? ( >=media-libs/openexr-1.2 ) spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) + zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-base/kdnssd ) ) virtual/fam virtual/ghostscript ~kde-base/kde-env-3" diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild index 9b632ee47d7c..3f1e06e7b25b 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild @@ -1,6 +1,6 @@ # 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.5-r4.ebuild,v 1.2 2006/11/16 01:18:40 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild,v 1.3 2006/11/17 18:36:35 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -38,7 +38,7 @@ RDEPEND="$(qt_min_version 3.3.3) kerberos? ( virtual/krb5 ) jpeg2k? ( media-libs/jasper ) openexr? ( >=media-libs/openexr-1.2.2-r2 ) - zeroconf? ( net-misc/mDNSResponder ) + zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-base/kdnssd ) ) fam? ( virtual/fam ) virtual/ghostscript utempter? ( sys-libs/libutempter ) diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild index dfd1a4f712c7..efbc2bb1196a 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild @@ -1,6 +1,6 @@ # 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.5-r5.ebuild,v 1.9 2006/11/16 13:29:01 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild,v 1.10 2006/11/17 18:36:35 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -38,7 +38,7 @@ RDEPEND="$(qt_min_version 3.3.3) kerberos? ( virtual/krb5 ) jpeg2k? ( media-libs/jasper ) openexr? ( >=media-libs/openexr-1.2.2-r2 ) - zeroconf? ( net-misc/mDNSResponder ) + zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-base/kdnssd ) ) fam? ( virtual/fam ) virtual/ghostscript utempter? ( sys-libs/libutempter ) diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild new file mode 100644 index 000000000000..82bda0412760 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild @@ -0,0 +1,188 @@ +# 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.5-r6.ebuild,v 1.1 2006/11/17 18:36:35 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 + mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~amd64" +IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff +zeroconf avahi kernel_linux fam lua linguas_he" + +# 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.16 + >=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.2-r2 ) + zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-base/kdnssd ) ) + fam? ( virtual/fam ) + virtual/ghostscript + utempter? ( sys-libs/libutempter ) + !kde-base/kde-env + lua? ( dev-lang/lua ) + spell? ( app-text/aspell app-dicts/aspell-en + linguas_he? ( >=app-text/hspell-1.0 ) )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext" + +RDEPEND="${RDEPEND} + || ( ( x11-apps/rgb x11-apps/iceauth ) lib64 symlink for amd64 2005.0 profile + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib + fi + + 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 /usr/share/config" +KDEDIRS="${PREFIX}:/usr:/usr/local" +#KDE_IS_PRELINKED=1 +EOF +} + +pkg_postinst() { + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" + elog "is running. Make sure also that multicast dns lookups are enabled by editing" + elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" + elog " hosts: files mdns dns" + echo + fi +}