From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R7DMA-0001xh-8G for garchives@archives.gentoo.org; Fri, 23 Sep 2011 21:32:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3970021C292; Fri, 23 Sep 2011 21:32:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CB9CF21C292 for ; Fri, 23 Sep 2011 21:32:07 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5FDC1B4039 for ; Fri, 23 Sep 2011 21:32:06 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id 8B70320035; Fri, 23 Sep 2011 21:32:05 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.7.1-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog kdelibs-4.7.1-r1.ebuild X-VCS-Directories: kde-base/kdelibs X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20110923213205.8B70320035@flycatcher.gentoo.org> Date: Fri, 23 Sep 2011 21:32:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a0b342758d5fa98be7a565a44aadc09b dilfridge 11/09/23 21:32:05 Modified: ChangeLog Added: kdelibs-4.7.1-r1.ebuild Log: Beautifying-the-clearbutton revbump =20 (Portage version: 2.1.10.19/cvs/Linux x86_64) Revision Changes Path 1.785 kde-base/kdelibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/C= hangeLog?rev=3D1.785&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/C= hangeLog?rev=3D1.785&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/C= hangeLog?r1=3D1.784&r2=3D1.785 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v retrieving revision 1.784 retrieving revision 1.785 diff -u -r1.784 -r1.785 --- ChangeLog 7 Sep 2011 20:13:54 -0000 1.784 +++ ChangeLog 23 Sep 2011 21:32:05 -0000 1.785 @@ -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.784 20= 11/09/07 20:13:54 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.785 20= 11/09/23 21:32:05 dilfridge Exp $ + +*kdelibs-4.7.1-r1 (23 Sep 2011) + + 23 Sep 2011; Andreas K. Huettel + +kdelibs-4.7.1-r1.ebuild, +files/kdelibs-4.7.1-clearbutton.patch: + Beautifying-the-clearbutton revbump =20 *kdelibs-4.7.1 (07 Sep 2011) =20 1.1 kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/k= delibs-4.7.1-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/k= delibs-4.7.1-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: kdelibs-4.7.1-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.1-r1.ebui= ld,v 1.1 2011/09/23 21:32:05 dilfridge Exp $ EAPI=3D4 CPPUNIT_REQUIRED=3D"optional" DECLARATIVE_REQUIRED=3D"always" OPENGL_REQUIRED=3D"optional" KDE_SCM=3D"git" inherit kde4-base fdo-mime toolchain-funcs DESCRIPTION=3D"KDE libraries needed by all KDE programs." HOMEPAGE=3D"http://www.kde.org/" KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linu= x" LICENSE=3D"LGPL-2.1" IUSE=3D"3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpe= g2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower upnp zeroconf" REQUIRED_USE=3D" udisks? ( udev ) upower? ( udev ) " # needs the kate regression testsuite from svn RESTRICT=3D"test" COMMONDEPEND=3D" app-crypt/qca:2 >=3Dapp-misc/strigi-0.6.3 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=3Ddev-libs/libattica-0.1.90 >=3Ddev-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 >=3Dmedia-libs/libpng-1.4 >=3Dmedia-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg >=3Dx11-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? ( >=3Dsys-auth/polkit-qt-0.99 ) semantic-desktop? ( >=3Ddev-libs/shared-desktop-ontologies-0.6.50 >=3Ddev-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=3D"${COMMONDEPEND} doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) " RDEPEND=3D"${COMMONDEPEND} !dev-libs/conversion !dev-libs/kunitconversion !x11-libs/qt-phonon !<=3Dkde-misc/kdnssd-avahi-0.1.2:0 !<=3Dkde-misc/knetworkmanager-4.4.0_p20100820 >=3Dapp-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) !aqua? ( x11-apps/iceauth x11-apps/rgb >=3Dx11-misc/xdg-utils-1.0.2-r3 udisks? ( sys-fs/udisks ) upower? ( sys-power/upower ) ) " PDEPEND=3D" || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) handbook? ( $(add_kdebase_dep khelpcenter) ) policykit? ( >=3Dkde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=3Dsys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( $(add_kdebase_dep nepomuk) ) " # Blockers added due to packages from old versions, removed in the meanwh= ile # as well as for file collisions add_blocker libknotificationitem add_blocker libkworkspace '<4.3.66' add_blocker kcontrol '<4.5.80' # @since 4.4 - kpilot is gone (blocker added to help upgrades) add_blocker kpilot # Block some old versions of KDE-3.5 packages that don't work well with K= DE-4 add_blocker kdebase 0 3.5.9-r4:3.5 add_blocker kdebase-startkde 0 3.5.10:3.5 add_blocker kdelibs 0 '<3.5.10:3.5' # libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -= > 4.3.75 add_blocker plasma-workspace '<4.3.75' PATCHES=3D( "${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" "${FILESDIR}/${PN}-4.7.1-clearbutton.patch" ) pkg_pretend() { if [[ ${MERGE_TYPE} !=3D 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 RENA= ME kde-4-applications.menu|g' \ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.m= enu 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 FindKDE4Int= ernal.cmake" #if [[ ${CHOST} =3D=3D *-darwin8 ]]; then sed -i -e \ "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_par= am 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 =3D .*Backends::IOKit.*;|m_backend =3D 0;|g" -i sol= id/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/discov= ery.cpp \ || die "fixing nameser include failed" append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=3D1 # Try to fix kkeyserver_mac epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch fi if [[ ${CHOST} =3D=3D *-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=3D(-DWITH_Avahi=3DON -DWITH_DNSSD=3DOFF) elif has_version net-misc/mDNSResponder; then mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DON) else die "USE=3D\"zeroconf\" enabled but neither net-dns/avahi nor net-misc= /mDNSResponder were found." fi else mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DOFF) fi mycmakeargs+=3D( -DWITH_HSPELL=3DOFF -DWITH_ASPELL=3DOFF -DKDE_DEFAULT_HOME=3D.kde4 -DKAUTH_BACKEND=3DPOLKITQT-1 $(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=3D${PV:0:3}.0 local _dir=3D${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=3DQT_PLUGIN_PATH" > "${T}/77kde" echo "QT_PLUGIN_PATH=3D${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 'mdn= sd' 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 }