[gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, media-gfx/digikam/, net-libs/libkvkontakte/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, media-gfx/digikam/, net-libs/libkvkontakte/, ...
@ 2012-11-18 17:30 Andreas Hüttel
  0 siblings, 0 replies; only message in thread
From: Andreas Hüttel @ 2012-11-18 17:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0082c466bccec9b110bb5896d1d8f61cac129783
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 17:29:48 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 17:29:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0082c466

[digikam] Add keywords to digikam-3 and friends, and mask them simultaneously

---
 media-gfx/digikam/digikam-3.0.0_beta1.ebuild       |  154 -------------------
 media-gfx/digikam/digikam-3.0.0_beta2.ebuild       |  156 --------------------
 media-gfx/digikam/digikam-3.0.0_beta3.ebuild       |    2 +-
 media-libs/libkface/libkface-3.0.0_beta1.ebuild    |   38 -----
 media-libs/libkface/libkface-3.0.0_beta2.ebuild    |   38 -----
 media-libs/libkface/libkface-3.0.0_beta3.ebuild    |    2 +-
 .../libkgeomap/libkgeomap-3.0.0_beta1.ebuild       |   29 ----
 .../libkgeomap/libkgeomap-3.0.0_beta2.ebuild       |   29 ----
 .../libkgeomap/libkgeomap-3.0.0_beta3.ebuild       |    2 +-
 .../kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild   |  121 ---------------
 .../kipi-plugins/kipi-plugins-3.0.0_beta3.ebuild   |    4 +-
 .../libkvkontakte/libkvkontakte-3.0.0_beta1.ebuild |   38 -----
 .../libkvkontakte/libkvkontakte-3.0.0_beta2.ebuild |   38 -----
 .../libkvkontakte/libkvkontakte-3.0.0_beta3.ebuild |    2 +-
 .../libmediawiki/libmediawiki-3.0.0_beta1.ebuild   |   39 -----
 .../libmediawiki/libmediawiki-3.0.0_beta2.ebuild   |   39 -----
 .../libmediawiki/libmediawiki-3.0.0_beta3.ebuild   |    2 +-
 profiles/package.mask                              |   12 ++
 profiles/package.mask.d/digikam-3                  |   11 ++
 19 files changed, 30 insertions(+), 726 deletions(-)

diff --git a/media-gfx/digikam/digikam-3.0.0_beta1.ebuild b/media-gfx/digikam/digikam-3.0.0_beta1.ebuild
deleted file mode 100644
index a6efd1e..0000000
--- a/media-gfx/digikam/digikam-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.9.0.ebuild,v 1.2 2012/09/04 14:56:27 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.9"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}a
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS=""
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
-
-#Keep libf2c blocker until bug 433782 is resolved
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi '' '4.9.80')
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep solid)
-	media-libs/jasper
-	media-libs/lcms:0
-	media-libs/lensfun
-	media-libs/libkface
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng
-	media-libs/tiff
-	sci-libs/clapack
-	virtual/jpeg
-	x11-libs/qt-gui:4[qt3support]
-	|| ( x11-libs/qt-sql:4[mysql] x11-libs/qt-sql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2 )
-	mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}

diff --git a/media-gfx/digikam/digikam-3.0.0_beta2.ebuild b/media-gfx/digikam/digikam-3.0.0_beta2.ebuild
deleted file mode 100644
index 46fccc7..0000000
--- a/media-gfx/digikam/digikam-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.9.0.ebuild,v 1.2 2012/09/04 14:56:27 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.9"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS=""
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
-
-#Keep libf2c blocker until bug 433782 is resolved
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep libkdcraw '' '4.9.80')
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi '' '4.9.80')
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep solid)
-	media-libs/jasper
-	media-libs/lcms:0
-	media-libs/lensfun
-	media-libs/libkface
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng
-	media-libs/tiff
-	sci-libs/clapack
-	virtual/jpeg
-	x11-libs/qt-gui:4[qt3support]
-	|| ( x11-libs/qt-sql:4[mysql] x11-libs/qt-sql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2 )
-	mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${PN}-2.9.0"-mariadb55.patch )
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}

diff --git a/media-gfx/digikam/digikam-3.0.0_beta3.ebuild b/media-gfx/digikam/digikam-3.0.0_beta3.ebuild
index 46fccc7..46fb9bd 100644
--- a/media-gfx/digikam/digikam-3.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-3.0.0_beta3.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://kde/unstable/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 

diff --git a/media-libs/libkface/libkface-3.0.0_beta1.ebuild b/media-libs/libkface/libkface-3.0.0_beta1.ebuild
deleted file mode 100644
index 0ecbae0..0000000
--- a/media-libs/libkface/libkface-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.9.0.ebuild,v 1.1 2012/09/03 19:10:53 creffett Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}a
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND="media-libs/opencv"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/media-libs/libkface/libkface-3.0.0_beta2.ebuild b/media-libs/libkface/libkface-3.0.0_beta2.ebuild
deleted file mode 100644
index e1f67ed..0000000
--- a/media-libs/libkface/libkface-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.9.0.ebuild,v 1.1 2012/09/03 19:10:53 creffett Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND="media-libs/opencv"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/media-libs/libkface/libkface-3.0.0_beta3.ebuild b/media-libs/libkface/libkface-3.0.0_beta3.ebuild
index e1f67ed..b1cabc8 100644
--- a/media-libs/libkface/libkface-3.0.0_beta3.ebuild
+++ b/media-libs/libkface/libkface-3.0.0_beta3.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detec
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT=4
 

diff --git a/media-libs/libkgeomap/libkgeomap-3.0.0_beta1.ebuild b/media-libs/libkgeomap/libkgeomap-3.0.0_beta1.ebuild
deleted file mode 100644
index 8d8dd9c..0000000
--- a/media-libs/libkgeomap/libkgeomap-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.9.0.ebuild,v 1.1 2012/09/03 19:07:17 creffett Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.9"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}a
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND="
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep marble kde,plasma)
-"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"

diff --git a/media-libs/libkgeomap/libkgeomap-3.0.0_beta2.ebuild b/media-libs/libkgeomap/libkgeomap-3.0.0_beta2.ebuild
deleted file mode 100644
index 6525463..0000000
--- a/media-libs/libkgeomap/libkgeomap-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.9.0.ebuild,v 1.1 2012/09/03 19:07:17 creffett Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.9"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND="
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep marble kde,plasma)
-"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"

diff --git a/media-libs/libkgeomap/libkgeomap-3.0.0_beta3.ebuild b/media-libs/libkgeomap/libkgeomap-3.0.0_beta3.ebuild
index 6525463..990b485 100644
--- a/media-libs/libkgeomap/libkgeomap-3.0.0_beta3.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-3.0.0_beta3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT=4
 

diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild
deleted file mode 100644
index 7c745b1..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.9.0.ebuild,v 1.1 2012/09/03 19:13:18 creffett Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.7"
-
-KDE_LINGUAS="ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga
-gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn
-nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh
-zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-
-inherit flag-o-matic kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS=""
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
-
-DEPEND="
-	$(add_kdebase_dep libkipi '' '4.9.80')
-	$(add_kdebase_dep libkdcraw '' '4.9.80')
-	$(add_kdebase_dep libkexiv2)
-	dev-libs/expat
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	gpssync?	( media-libs/libkgeomap )
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	mediawiki?	( >=media-libs/libmediawiki-2.6.0 )
-	panorama?	( dev-libs/boost )
-	redeyes?	( media-libs/opencv )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-RESTRICT=test
-# bug 420203
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0_beta3-options.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Remove flags -floop-block -floop-interchange
-	# -floop-strip-mine due to bug #305443.
-	filter-flags -floop-block
-	filter-flags -floop-interchange
-	filter-flags -floop-strip-mine
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with gpssync KGeoMap)
-		$(cmake-utils_use_with mediawiki MEDIAWIKI)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_enable expoblending)
-		$(cmake-utils_use_enable panorama)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta3.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta3.ebuild
index 7c745b1..dc5e130 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta3.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
 
@@ -48,7 +48,7 @@ DEPEND="
 			  media-libs/libgpod
 			  x11-libs/gtk+:2
 			)
-	mediawiki?	( >=media-libs/libmediawiki-2.6.0 )
+	mediawiki?	( >=net-libs/libmediawiki-2.6.0 )
 	panorama?	( dev-libs/boost )
 	redeyes?	( media-libs/opencv )
 	scanner? 	(

diff --git a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta1.ebuild b/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta1.ebuild
deleted file mode 100644
index 734f696..0000000
--- a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.9.0.ebuild,v 1.1 2012/09/03 19:12:25 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}a
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND=">=dev-libs/qjson-0.7.0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta2.ebuild b/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta2.ebuild
deleted file mode 100644
index 4061673..0000000
--- a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.9.0.ebuild,v 1.1 2012/09/03 19:12:25 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND=">=dev-libs/qjson-0.7.0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta3.ebuild b/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta3.ebuild
index 4061673..de4093c 100644
--- a/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta3.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-3.0.0_beta3.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Library for accessing the features of social networking site vkonta
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT=4
 

diff --git a/net-libs/libmediawiki/libmediawiki-3.0.0_beta1.ebuild b/net-libs/libmediawiki/libmediawiki-3.0.0_beta1.ebuild
deleted file mode 100644
index 455816a..0000000
--- a/net-libs/libmediawiki/libmediawiki-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.9.0.ebuild,v 1.1 2012/09/03 19:11:40 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}a
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND=""
-RDEPEND=${DEPEND}
-
-#Tests from bug 420205 now hang
-RESTRICT=test
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/net-libs/libmediawiki/libmediawiki-3.0.0_beta2.ebuild b/net-libs/libmediawiki/libmediawiki-3.0.0_beta2.ebuild
deleted file mode 100644
index 705ac2b..0000000
--- a/net-libs/libmediawiki/libmediawiki-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.9.0.ebuild,v 1.1 2012/09/03 19:11:40 creffett Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.9"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-SRC_URI="mirror://kde/unstable/digikam/${MY_P}.tar.bz2"
-
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND=""
-RDEPEND=${DEPEND}
-
-#Tests from bug 420205 now hang
-RESTRICT=test
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}

diff --git a/net-libs/libmediawiki/libmediawiki-3.0.0_beta3.ebuild b/net-libs/libmediawiki/libmediawiki-3.0.0_beta3.ebuild
index 705ac2b..a616ce1 100644
--- a/net-libs/libmediawiki/libmediawiki-3.0.0_beta3.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-3.0.0_beta3.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT=4
 

diff --git a/profiles/package.mask b/profiles/package.mask
index dac1f26..8120272 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,18 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
+
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# digikam-3 and friends requires kde-4.10
+=media-gfx/digikam-3*
+=media-plugins/kipi-plugins-3*
+=media-libs/libkface-3*
+=media-libs/libkgeomap-3*
+=net-libs/libmediawiki-3*
+=net-libs/libkvkontakte-3*
+
+
+
 # Dennis Schridde <devurandom@gmx.net> (25 Mar 2012)
 # Dependency net-libs/libinfinity is p-masked
 net-libs/libqinfinity

diff --git a/profiles/package.mask.d/digikam-3 b/profiles/package.mask.d/digikam-3
new file mode 100644
index 0000000..adeebae
--- /dev/null
+++ b/profiles/package.mask.d/digikam-3
@@ -0,0 +1,11 @@
+
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# digikam-3 and friends requires kde-4.10
+=media-gfx/digikam-3*
+=media-plugins/kipi-plugins-3*
+=media-libs/libkface-3*
+=media-libs/libkgeomap-3*
+=net-libs/libmediawiki-3*
+=net-libs/libkvkontakte-3*
+
+


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-11-18 17:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-18 17:30 [gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, media-gfx/digikam/, net-libs/libkvkontakte/, Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox