kensington 14/04/17 18:16:54 Modified: ChangeLog kde4-meta.eclass Log: Sync with overlay. Remove unused inherit. Switch to git-r3 eclass. Fix file collisions wrt bug #499032 and bug #507860. Add more dep reduction. Cosmetic improvements.
Revision Changes Path 1.1211 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1211&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1211&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1210&r2=1.1211 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1210 retrieving revision 1.1211 diff -u -r1.1210 -r1.1211 --- ChangeLog 16 Apr 2014 11:33:17 -0000 1.1210 +++ ChangeLog 17 Apr 2014 18:16:54 -0000 1.1211 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1210 2014/04/16 11:33:17 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1211 2014/04/17 18:16:54 kensington Exp $ + + 17 Apr 2014; Michael Palimaka <[email protected]> kde4-meta.eclass: + Sync with overlay. Remove unused inherit. Switch to git-r3 eclass. Fix file + collisions wrt bug #499032 and bug #507860. Add more dep reduction. Cosmetic + improvements. 16 Apr 2014; Julian Ospald <[email protected]> waf-utils.eclass: respect CFLAGS in linking command wrt #506956 1.76 eclass/kde4-meta.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.76&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.76&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.75&r2=1.76 Index: kde4-meta.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- kde4-meta.eclass 6 Feb 2014 17:07:56 -0000 1.75 +++ kde4-meta.eclass 17 Apr 2014 18:16:54 -0000 1.76 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.75 2014/02/06 17:07:56 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.76 2014/04/17 18:16:54 kensington Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -17,7 +17,7 @@ [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" -inherit kde4-base versionator +inherit kde4-base KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" EXPORT_FUNCTIONS ${KDEMETA_EXPF} @@ -130,7 +130,7 @@ subversion_bootstrap ;; git) - git-2_src_unpack + git-r3_src_unpack ;; esac fi @@ -365,7 +365,7 @@ # @DESCRIPTION: # Meta-package build system configuration handling - commenting out targets, etc.. kde4-meta_src_prepare() { - debug-print-function ${FUNCNAME} "$@" + debug-print-function ${FUNCNAME} "$@" kde4-meta_change_cmakelists kde4-base_src_prepare @@ -444,7 +444,7 @@ -e 's/^#DONOTCOMPILE //g' \ -e '/install(.*)/I{s/^/#DONOTINSTALL /;}' \ -e '/^install(/,/)/I{s/^/#DONOTINSTALL /;}' \ - -e '/kde4_install_icons(.*)/{s/^/#DONOTINSTALL /;}' || \ + -e '/kde4_install_icons(.*)/I{s/^/#DONOTINSTALL /;}' || \ die "${LINENO}: sed died in the KMCOMPILEONLY section while processing ${i}" _change_cmakelists_parent_dirs ${i} done @@ -503,6 +503,9 @@ fi ;; kde-runtime) + sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/LibGcrypt/s/REQUIRED//' -i CMakeLists.txt \ + || die "${LINENO}: sed died in kde-runtime dep reduction section" + # COLLISION PROTECT section # Only install the kde4 script as part of kde-base/kdebase-data if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then @@ -572,7 +575,7 @@ # Currently just calls its equivalent in kde4-base.eclass(5) if # I_KNOW_WHAT_I_AM_DOING is set. Use this in split ebuilds. kde4-meta_src_test() { - debug-print-function $FUNCNAME "$@" + debug-print-function ${FUNCNAME} "$@" if [[ $I_KNOW_WHAT_I_AM_DOING ]]; then kde4-base_src_test @@ -585,7 +588,7 @@ # @DESCRIPTION: # Function for installing KDE4 split applications. kde4-meta_src_install() { - debug-print-function $FUNCNAME "$@" + debug-print-function ${FUNCNAME} "$@" # Search ${S}/${KMMODULE} and install common documentation files found local doc
