From: Andreas Hüttel Date: Wed, 28 Dec 2011 22:07:07 +0000 (+0000) Subject: Copy -r0 to -r10, disable UPNP in -r0 for stabilization X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9feac9b2e160012b292553fa5734afefe9d0eede;p=gentoo.git Copy -r0 to -r10, disable UPNP in -r0 for stabilization Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 6a6e94d661f5..fe87d114c05f 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.812 2011/12/26 16:12:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.813 2011/12/28 22:07:07 dilfridge Exp $ + +*kdelibs-4.7.4-r10 (28 Dec 2011) + + 28 Dec 2011; Andreas K. Huettel kdelibs-4.7.4.ebuild, + +kdelibs-4.7.4-r10.ebuild: + Copy -r0 to -r10, disable UPNP in -r0 for stabilization 26 Dec 2011; Andreas K. Huettel kdelibs-4.6.3-r3.ebuild: diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 5fc5f74ff16f..8e33efc52586 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -27,23 +27,24 @@ DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba EBUILD kdelibs-4.6.3-r3.ebuild 10267 RMD160 ab37da5d4a2a6ff65143b3e7a569274309615c90 SHA1 00a26ee63092a99f8e910ce9e553db52c81dba8d SHA256 aac5be6a7b5f61d8f4b876e743a1bf2f82c21efa8f5a823af7d46f7b68165033 EBUILD kdelibs-4.7.3-r1.ebuild 9258 RMD160 548c38a475ef5026f7e15b471273239ce83b0ffc SHA1 3a2503920447e418c823e12a938837777e2e95a5 SHA256 409c7827589f9169438134d2e40bffce82ca593756cad574573f32089be051f7 EBUILD kdelibs-4.7.3-r11.ebuild 9312 RMD160 c4a672ffea8fd177fef6b3afaa9526ab3e8ba4cc SHA1 d83656c8d4ec7cebe36c203092ca9f1daebe9033 SHA256 03010896d7a5880f06136476c92738c2d7ae34a2007ec965b992dd42284db159 -EBUILD kdelibs-4.7.4.ebuild 9264 RMD160 ada5d138f23e87514d6cc8b1d63943b0f999d276 SHA1 9f7d7d22ab01bfe5827f55ea12c5a22faacc7fd9 SHA256 a624a141d121444a4ef1d05ba5e799c2b0c8a7a67a602ed0e140271e11bb2957 -MISC ChangeLog 135984 RMD160 35e9e0657ce08dab195ca80a13d70a101747469f SHA1 c5b76bddee7004aba69ac873d55f810b07e3f3a1 SHA256 9d0aabb24f0c2298198d3a1a3d5014e498a2d4e2e8512ffd6c051e61afa2c42a +EBUILD kdelibs-4.7.4-r10.ebuild 9268 RMD160 d73da9f0a53f78bdb6582774eaf3658c8910db80 SHA1 b0ccbcfe53f9e99c8ee79734752d2912d5de021e SHA256 4003e514a923c908b591257bc048baeab5f16ea7866f6cd25db4836215ef6b77 +EBUILD kdelibs-4.7.4.ebuild 9213 RMD160 3e79dc67909fdd43d9ee735bc5b9fdf9533fd91e SHA1 58f794525c60eab31aa5a0acfaa2f67d622e64bf SHA256 c0a2924df2dd07cc1aa21c71b3d6a1ebb07a1f40f4ed75d6ae054041e22a37c0 +MISC ChangeLog 136185 RMD160 7d1cedae47691e7c14e48039b45dd022b381f104 SHA1 6b33d4403989ab845e6893c5d3447e1e0188b022 SHA256 b1a15202a0ef8d549f0ac0c610f2a1fe938fc078c83046427df6df657b18bead MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJO+J19AAoJEEb+UGWnxTyHHwwQAKOPcKognXpXk+9lR05D3LHH -yAmguKS1WRbVaqulocO6K+NGYdOKapQVJjN4UBoiVs6V3lI+WEpelpldOEBdJUk8 -BaY+5mDv8SwZ5a/y2FGksUfbc4Izq8ge4/EHG/U+RwyyL5AoaobYqB6jmgCaIItr -4dlT1pJlySu0UM8CsGhdrtG8ivIxXL41S//SPwuA3GIDFXG5lZ3cyqrhba/KC6yi -tuERjMAbR6N+wWlbbrZB6B9IQPbpy2ag3dJ1ym+LAWm6218YsjoL97l4+Oa1qjn/ -+VQS4Yr6pcNgzCtaX13WVFdJ/n4h7MK7NwM0HI7Yng/R0xYCsNfcRMp1zyIUEghU -d4BIihSBF5nT7mF8F1u7r/8m1VAw6ZHbcWyv9l1Gt06/7Oqn3Ie9DmFj9wfMhyXe -d2s4zc0GmvpKygwNSq5r4gw1xE46CdMQp8vWWD6evOZEBFhK7X6UWVNCuSsCS4oq -ISHuR/HVubaBlkaFTE6uR/Y5L0WCgrrv/MEtA2t6wbs08CJFRm/uFbRi0ba150RH -jBbVcqU64oantHWmxd61n4WPYVYGT8mCHH9LwTCN9tCTtP6I/ePDKwN3mO3PwgXY -MeetDsCeUOyVCCBxw2sfHd8roELO7a1pxxX3WFsMeSJ2h3mWRZWsOv61WkprJ6WC -YNnZWVuNkuG85oHwIVxX -=4WAB +iQIcBAEBCgAGBQJO+5OSAAoJEEb+UGWnxTyHcroP/jXA5rvvVVOK6fEVSaGkNrbF +mtDGf2Ngr1x2azSzoZVNI5FAiKOOW/VKekzUGQvWeS723JkbPhm0GKEuU3m6Uhh2 +7s2MrJ7+39AHAxc0VRPw4JRy/IdxVMY+R3MB0j4RTIuu9DLpcLCss1IghV3uG/1d +eskKitE+RlCFsXNq4BlGh67uvDjrwBz32KB3DsWFLIXkeoUYkpQETjxMrviFA8F6 +HyrjdbXvMy66k0ALerHiI5n41VrXJG43YpNuNKXNY4BTmhTBgAw1eV1e1SW6Ylrp +/BTupQKnNPuEcuaz/5h0d0OSMCzUxWhYGZbKfVRJBt2sRwXXH8TnjO3qRd622rJH +0Bj7hdq9baVF2tfWQX7wCAwtEnprqmpsckIvcTp7zEUNI5yWBL+xGFMSeVfPeCTq +2Uca3rj6a28OQHGuXUHICa/ui/1fwXVkG154K02H7ETSxz8BnMTsnKF4wth7rYdn +ZJ26Y4k9goQXhivRj2XvyUxaoUjuhYBzan85Ls8KOAvJ/66nLWfD6jkXVwtxX+Ek +S3Dwbhpsl6D8jLpfchNG+/y8khUmc1In/mOcpm7xsS8P4W8+HpL948LwrvidlNJC +zhBBJMI3exmwy9e2GV7GBf4X5cPUFb0ClKk+mcoNqcKhT1HwJTVALetY31kzzKun +fFqYj7n1Vcx4gEe7dOdO +=hPE9 -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/kdelibs-4.7.4-r10.ebuild b/kde-base/kdelibs/kdelibs-4.7.4-r10.ebuild new file mode 100644 index 000000000000..1f71bf6cb744 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.7.4-r10.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4-r10.ebuild,v 1.1 2011/12/28 22:07:07 dilfridge Exp $ + +EAPI=4 + +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +OPENGL_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base fdo-mime toolchain-funcs + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos +lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev ++udisks +upower upnp zeroconf" + +REQUIRED_USE=" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-crypt/qca:2 + >=app-misc/strigi-0.7.6 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + >=dev-libs/libattica-0.1.90 + >=dev-libs/libdbusmenu-qt-0.3.2 + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + >=media-libs/libpng-1.4 + >=media-libs/phonon-4.4.3 + sys-libs/zlib + virtual/jpeg + >=x11-misc/shared-mime-info-0.60 + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + !aqua? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + !kernel_SunOS? ( sys-libs/libutempter ) + ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + lzma? ( app-arch/xz-utils ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + policykit? ( >=sys-auth/polkit-qt-0.99 ) + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.6.50 + >=dev-libs/soprano-2.6.51[dbus,raptor,redland] + ) + spell? ( app-text/enchant ) + ssl? ( dev-libs/openssl ) + udev? ( sys-fs/udev ) + upnp? ( media-libs/herqq ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !x11-libs/qt-phonon + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 + udisks? ( sys-fs/udisks ) + upower? ( sys-power/upower ) + ) +" +PDEPEND=" + $(add_kdebase_dep katepart) + || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) + handbook? ( $(add_kdebase_dep khelpcenter) ) + policykit? ( + >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 + >=sys-auth/polkit-kde-agent-0.99 + ) + semantic-desktop? ( $(add_kdebase_dep nepomuk) ) +" + +# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities +add_blocker plasma-workspace 4.7.1 + +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" + "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" + "${FILESDIR}/${PN}-4.6.3-bytecode.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." + fi +} + +src_prepare() { + kde4-base_src_prepare + use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) + sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + + if use aqua; then + sed -i -e \ + "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ + cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" + + #if [[ ${CHOST} == *-darwin8 ]]; then + sed -i -e \ + "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ + cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" + #fi + + # solid/solid/backends/iokit doesn't properly link, so disable it. + sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ + || die "disabling solid/solid/backends/iokit failed" + sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ + || die "disabling solid/solid/backends/iokit failed" + + # There's no fdatasync on OSX and the check fails to detect that. + sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ + || die "disabling fdatasync failed" + + # Fix nameser include to nameser8_compat + sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ + || die "fixing nameser include failed" + append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 + + # Try to fix kkeyserver_mac + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" + # getgrouplist not in solaris libc + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" + # solaris has no d_type element in dir_ent + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" + fi +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) + elif has_version net-misc/mDNSResponder; then + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + else + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) + fi + mycmakeargs+=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=.kde4 + -DKAUTH_BACKEND=POLKITQT-1 + -DBUILD_libkactivities=OFF + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_has 3dnow X86_3DNOW) + $(cmake-utils_use_has altivec PPC_ALTIVEC) + $(cmake-utils_use_has mmx X86_MMX) + $(cmake-utils_use_has sse X86_SSE) + $(cmake-utils_use_has sse2 X86_SSE2) + $(cmake-utils_use_with acl) + $(cmake-utils_use_with alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with policykit PolkitQt-1) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with upnp HUpnp) + ) + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + # use system certificates + rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + dohtml -r ${P}-apidocs/* + fi + + if use aqua; then + einfo "fixing ${PN} plugins" + + local _PV=${PV:0:3}.0 + local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script + + install_name_tool -id \ + "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + || die "failed fixing libkrossqtsplugin.${_PV}.dylib" + + einfo "fixing ${PN} cmake detection files" + #sed -i -e \ + # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ + echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ + "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ + || die "failed fixing FindXKB.cmake" + fi + + einfo Installing environment file. + # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. + echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" + doenvd "${T}/77kde" +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" + einfo "to include 'mdns', e.g.:" + einfo " hosts: files mdns dns" + echo + fi + + elog "Your homedir is set to \${HOME}/.kde4" + echo + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} diff --git a/kde-base/kdelibs/kdelibs-4.7.4.ebuild b/kde-base/kdelibs/kdelibs-4.7.4.ebuild index bab97d8cac93..c624c91a9aac 100644 --- a/kde-base/kdelibs/kdelibs-4.7.4.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.3 2011/12/28 22:07:07 dilfridge Exp $ EAPI=4 @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev -+udisks +upower upnp zeroconf" ++udisks +upower zeroconf" REQUIRED_USE=" udisks? ( udev ) @@ -80,7 +80,6 @@ COMMONDEPEND=" spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) - upnp? ( media-libs/herqq ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] @@ -226,7 +225,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with upnp HUpnp) + -DWITH_HUpnp=OFF ) kde4-base_src_configure }