diff options
| -rw-r--r-- | app-cdr/k3b/Manifest | 2 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-9999.ebuild | 3 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 75 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 29 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 31 | ||||
| -rw-r--r-- | media-libs/taglib-extras/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/taglib-extras/taglib-extras-9999.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.3.90.ebuild | 7 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-9999.ebuild | 7 |
10 files changed, 69 insertions, 93 deletions
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 5c5cd08603d..427b112be5c 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,2 +1,2 @@ -EBUILD k3b-9999.ebuild 3155 RMD160 a93c427b0c693941d3783f120cda2dadf63f5b95 SHA1 445433ab34efd7d1689f5d6b2aece8f20642907f SHA256 f69f8a2f21b962b4c1ce71d821d5ccb0a04b6301547b4447b553d976b5642553 +EBUILD k3b-9999.ebuild 3172 RMD160 f2e07b59bcc5d0a134331451b18e47f09469eb73 SHA1 b267dbce5df4b87143f80d7f1bb25834a2071511 SHA256 110d256ef0fa2e0dbb3a47f237539064d7a8022d07de026d092dc159c44cedc2 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0 diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild index 5f315902a57..7bfecfcc39f 100644 --- a/app-cdr/k3b/k3b-9999.ebuild +++ b/app-cdr/k3b/k3b-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI="3" CMAKE_MIN_VERSION=2.8.0 MULTIMEDIA_REQUIRED=always @@ -21,6 +21,7 @@ if [[ ${PV} != *9999* ]]; then S=${WORKDIR}/${P/_*} else + KDE_SCM="git" DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) fi diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index e6b2a601998..e5fa9a71eaa 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -10,8 +10,8 @@ # The kde4-base.eclass provides support for building KDE4 based ebuilds # and KDE4 applications. # -# NOTE: KDE 4 ebuilds by default define EAPI="2", this can be redefined but -# eclass will fail with version older than 2. +# NOTE: KDE 4 ebuilds currently support EAPI "3". This will be reviewed +# over time as new EAPI versions are approved. # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: @@ -30,11 +30,17 @@ inherit kde4-functions base virtualx eutils get_build_type if [[ ${BUILD_TYPE} = live ]]; then - if [[ ${KDEBASE} = kdevelop ]]; then - inherit git - else - inherit subversion - fi + case ${KDE_SCM} in + svn) + inherit subversion + ;; + git) + inherit git + ;; + *) + die "unsupported scm: ${KDE_SCM}" + ;; + esac fi # @ECLASS-VARIABLE: CMAKE_REQUIRED @@ -369,6 +375,7 @@ if [[ ${PN} != kdelibs ]]; then fi fi fi + kdedepend=" dev-util/automoc dev-util/pkgconfig @@ -377,6 +384,7 @@ kdedepend=" x11-proto/xf86vidmodeproto ) " + kderdepend="" if [[ ${PN} != oxygen-icons ]]; then @@ -439,7 +447,7 @@ IUSE+=" kdeenablefinal" case ${BUILD_TYPE} in live) SRC_URI="" - if has subversion ${INHERITED}; then + if [[ "${KDE_SCM}" == "svn" ]]; then # Determine branch URL based on live type local branch_prefix case ${PV} in @@ -510,14 +518,16 @@ case ${BUILD_TYPE} in # for kde-base and koffice modules. Does not affect misc apps. # Default value is 1 hour. [[ ${KDEBASE} = kde-base || ${KDEBASE} = koffice ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1} - elif has git ${INHERITED}; then + elif [[ "${KDE_SCM}" == "git" ]]; then if [[ -z ${KMNOMODULE} ]] && [[ -z ${KMMODULE} ]]; then KMMODULE="${PN}" fi case ${KDEBASE} in kdevelop) - EGIT_REPO_URI="git://git.kde.org/${KMMODULE}" + EGIT_REPO_URI="git://anongit.kde.org/${KMMODULE}" ;; + *) + EGIT_REPO_URI="git://anongit.kde.org/${PN}" esac fi ;; @@ -585,15 +595,6 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - # Prefix compat: - if [[ ${EAPI} == 2 ]] && ! use prefix; then - EPREFIX= - EROOT=${ROOT} - fi - - # Append missing trailing slash character - [[ ${EROOT} = */ ]] || EROOT+="/" - # QA ebuilds [[ -z ${KDE_MINIMAL_VALID} ]] && ewarn "QA Notice: ignoring invalid KDE_MINIMAL (defaulting to ${KDE_MINIMAL})." @@ -651,28 +652,15 @@ kde4-base_src_unpack() { debug-print-function ${FUNCNAME} "$@" if [[ ${BUILD_TYPE} = live ]]; then - if has subversion ${INHERITED}; then - migrate_store_dir - subversion_src_unpack - elif has git ${INHERITED}; then - git_src_unpack - fi - elif [[ ${EAPI} == 2 ]]; then - local file - for file in ${A}; do - # This setup is because EAPI <= 2 cannot unpack *.tar.xz files - # directly, so we do it ourselves (using the exact same code as portage) - case ${file} in - *.tar.xz) - echo ">>> Unpacking ${file} to ${PWD}" - xz -dc "${DISTDIR}"/${file} | tar xof - - assert "failed unpacking ${file}" - ;; - *) - unpack ${file} - ;; - esac - done + case ${KDE_SCM} in + svn) + migrate_store_dir + subversion_src_unpack + ;; + git) + git_src_unpack + ;; + esac else # For EAPI >= 3, we can just use unpack() directly unpack ${A} @@ -863,11 +851,6 @@ kde4-base_src_test() { kde4-base_src_install() { debug-print-function ${FUNCNAME} "$@" - # Prefix support, for usage in ebuilds - if [[ ${EAPI} == 2 ]] && ! use prefix; then - ED=${D} - fi - if [[ -n ${KMSAVELIBS} ]] ; then install_library_dependencies fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index eb0f32949de..5b15575fc5f 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -14,10 +14,10 @@ inherit versionator # @ECLASS-VARIABLE: EAPI # @DESCRIPTION: -# By default kde4 eclasses want EAPI 2 which might be redefinable to newer -# versions. +# Currently kde4 eclasses support EAPI 3. Over time newer versions +# will be supported. case ${EAPI:-0} in - 2|3) : ;; + 3) : ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -36,6 +36,11 @@ elif [[ ${KMNAME} = kdevelop ]]; then KDEBASE="kdevelop" fi +# @ECLASS-VARIABLE: KDE_SCM +# @DESCRIPTION: +# If this is a live package which scm does it use - default to svn +KDE_SCM="${KDE_SCM:-svn}" + # @ECLASS-VARIABLE: KDE_SLOTS # @DESCRIPTION: # The slots used by all KDE versions later than 4.0. The live KDE releases use @@ -64,24 +69,6 @@ slot_is_at_least() { buildsycoca() { debug-print-function ${FUNCNAME} "$@" - if [[ ${EAPI} == 2 ]] && ! use prefix; then - EROOT=${ROOT} - fi - - local KDE3DIR="${EROOT}usr/kde/3.5" - if [[ -z ${EROOT%%/} && -x "${KDE3DIR}"/bin/kbuildsycoca ]]; then - # Since KDE3 is aware of shortcuts in /usr, rebuild database - # for KDE3 as well. - touch "${KDE3DIR}"/share/services/ksycoca - chmod 644 "${KDE3DIR}"/share/services/ksycoca - - ebegin "Running kbuildsycoca to build global database" - XDG_DATA_DIRS="${EROOT}usr/local/share:${KDE3DIR}/share:${EROOT}usr/share" \ - DISPLAY="" \ - "${KDE3DIR}"/bin/kbuildsycoca --global --noincremental &> /dev/null - eend $? - fi - # We no longer need to run kbuildsycoca4, as kded does that automatically, as needed # fix permission for some directories diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 97593ec693e..425ad8519fc 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -70,12 +70,14 @@ debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-sp # Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc) case ${BUILD_TYPE} in live) - case ${KMNAME} in - extragear*|playground*) - ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}" - ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}" - ;; - esac + if [[ "${KDE_SCM}" == "svn" ]]; then + case ${KMNAME} in + extragear*|playground*) + ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}" + ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}" + ;; + esac + fi ;; esac @@ -145,12 +147,17 @@ kde4-meta_src_unpack() { debug-print-function ${FUNCNAME} "$@" if [[ ${BUILD_TYPE} = live ]]; then - migrate_store_dir - S="${WORKDIR}/${P}" - mkdir -p "${S}" - ESVN_RESTRICT="export" subversion_src_unpack - subversion_wc_info - subversion_bootstrap + if [[ "$KDE_SCM" == "svn" ]]; then + migrate_store_dir + S="${WORKDIR}/${P}" + mkdir -p "${S}" + ESVN_RESTRICT="export" subversion_src_unpack + subversion_wc_info + subversion_bootstrap + elif [[ "${KDE_SCM}" == "git" ]]; then + ?? + fi + kde4-meta_src_extract else kde4-meta_src_extract diff --git a/media-libs/taglib-extras/Manifest b/media-libs/taglib-extras/Manifest index 46422c1b094..3216993a47e 100644 --- a/media-libs/taglib-extras/Manifest +++ b/media-libs/taglib-extras/Manifest @@ -1,2 +1,2 @@ -EBUILD taglib-extras-9999.ebuild 785 RMD160 3a2c98d74a738ba843f1ca333119569e16e0a766 SHA1 23911ad203319a086b1e15f94a798fd1018cd255 SHA256 48ee63e36ef1f4bbdc2bce9d6ff511a2538fa80c1168548525e65fc1e4f4dfff +EBUILD taglib-extras-9999.ebuild 785 RMD160 e61f50cf32ad896b0327c77fad125d1cee6914bf SHA1 981bccf63378dd7553907221d0dd44aa0382e5fb SHA256 ef69beca13b2cfc4648175db0a64203cd38368e12124945f17258dadfbf8b544 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/media-libs/taglib-extras/taglib-extras-9999.ebuild b/media-libs/taglib-extras/taglib-extras-9999.ebuild index edc88567c6e..7e29319f60d 100644 --- a/media-libs/taglib-extras/taglib-extras-9999.ebuild +++ b/media-libs/taglib-extras/taglib-extras-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" KMNAME="kdesupport" KDE_REQUIRED="optional" diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index b1d26d06801..64bbcb65111 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -2,8 +2,8 @@ Hash: SHA256 DIST amarok-2.3.90.tar.bz2 14920987 RMD160 3c6456fc82875b61a1d1fb7b45cbf43e519da60a SHA1 bf67c7ac9d436fe76f75734a6c011efa5e824947 SHA256 727072e7d6e3af71098452c76385e9f0983a5ac8e3224c43de893fdb97ee795f -EBUILD amarok-2.3.90.ebuild 4073 RMD160 b43297147f69920fdbae0d38515c4bc031e36654 SHA1 d1cd35341b6e2b35af6eae5035c6dfee7c062c3a SHA256 6e8b0ad140cc5b5342e05cc731846a298425091050e0fecd8c7e610941555e0a -EBUILD amarok-9999.ebuild 4073 RMD160 b43297147f69920fdbae0d38515c4bc031e36654 SHA1 d1cd35341b6e2b35af6eae5035c6dfee7c062c3a SHA256 6e8b0ad140cc5b5342e05cc731846a298425091050e0fecd8c7e610941555e0a +EBUILD amarok-2.3.90.ebuild 4011 RMD160 e20a75b5d7da9212b4ce832eb1bd2b423c81fae3 SHA1 eda3974f73f9cb9e635572f230e7aada2ca532cc SHA256 9bfd0296fef5687bdad8c6f52e4899049aa4b3a8120567fabea2253515c1d465 +EBUILD amarok-9999.ebuild 4011 RMD160 e20a75b5d7da9212b4ce832eb1bd2b423c81fae3 SHA1 eda3974f73f9cb9e635572f230e7aada2ca532cc SHA256 9bfd0296fef5687bdad8c6f52e4899049aa4b3a8120567fabea2253515c1d465 MISC metadata.xml 2384 RMD160 1e9411c37f455cd9fb86123666aa5854c0e10a1a SHA1 1a8e81fd7a81d4a977cc1c3c538f8dec79a8dbd5 SHA256 4a5e4eb285dd976746a8967d78c44b79fd1d04762df33db186faf3c254f2c19d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) diff --git a/media-sound/amarok/amarok-2.3.90.ebuild b/media-sound/amarok/amarok-2.3.90.ebuild index c17a62428f6..81806fca9d3 100644 --- a/media-sound/amarok/amarok-2.3.90.ebuild +++ b/media-sound/amarok/amarok-2.3.90.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" # Translations are only in the tarballs, not the git repo if [[ ${PV} != *9999* ]]; then @@ -11,13 +11,12 @@ if [[ ${PV} != *9999* ]]; then SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" else - EGIT_REPO_URI="git://anongit.kde.org/${PN}" - GIT_ECLASS="git" + KDE_SCM="git" KEYWORDS="" fi KDE_REQUIRED="never" -inherit flag-o-matic kde4-base ${GIT_ECLASS} +inherit flag-o-matic kde4-base DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index c17a62428f6..81806fca9d3 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" # Translations are only in the tarballs, not the git repo if [[ ${PV} != *9999* ]]; then @@ -11,13 +11,12 @@ if [[ ${PV} != *9999* ]]; then SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" else - EGIT_REPO_URI="git://anongit.kde.org/${PN}" - GIT_ECLASS="git" + KDE_SCM="git" KEYWORDS="" fi KDE_REQUIRED="never" -inherit flag-o-matic kde4-base ${GIT_ECLASS} +inherit flag-o-matic kde4-base DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" |