[kde-base/kipi-plugins] QA, sync live ebuild

4 files changed, 68 insertions, 77 deletions

diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 69af13f1eb2..7c50fc1bd61 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,4 +1,4 @@
 DIST kipi-plugins-1.2.0.tar.bz2 4597178 RMD160 bbf79302bedab7cd55e9d7d91253261e954c56cf SHA1 f68038c59ddae10840d67f0071201fdfcabbeabf SHA256 6724fcebca59bb1087ddaf401a0bfe8ffa5c8cb572bf97af9339d27b40bc85c3
-EBUILD kipi-plugins-1.2.0.ebuild 2005 RMD160 0a1c8ea0e70ea3f1b4e9190abf9b051b7b95c745 SHA1 6f34ff05d7e87cb25182fb67bda810a86277248f SHA256 583d18c60db7aa1d59cd4981168be52c2a19283930e6703f8ab67c70e7fd47a4
-EBUILD kipi-plugins-9999.ebuild 2061 RMD160 aaa526f8491fee611f5acc9e39ad09c48270939c SHA1 1e2e0664a77d9a3b7b0da4be68698970a9c71e61 SHA256 e633ffc58b44ed41f157e01b8c1cabe1f276e90aeee5759fa24242fc8470b788
-MISC metadata.xml 340 RMD160 94d31670360fb73210fa2174e59a44a93fef2d1c SHA1 2d2325ac5b20ccbd4927f9e385df77ed64134680 SHA256 3c31992e221d98db7a4248abe4e4b385628bbab83c88d4f6e8ee5f709fcae904
+EBUILD kipi-plugins-1.2.0.ebuild 1903 RMD160 bb9d67f8ae50fea9bc5223b2154c909e92475375 SHA1 98790c4f96c0e4bc1ac8f10f5b58c12378136456 SHA256 e3afdecfe5e88a69bb6f3c2bfed766bf5174101916b61b8a4b20ebc12a57ad37
+EBUILD kipi-plugins-9999.ebuild 1892 RMD160 88ac073cfdf4e6639eb6da7f65cfe0c97dd5d588 SHA1 363626e752c6c99ae4125ad3e57e9c8b6151c121 SHA256 77af3dc2e82dee981f7f4a33638d411e4091eef773106784bec5ed0ca06121f5
+MISC metadata.xml 278 RMD160 57e788f55474f3c76586aaf76434441863738e78 SHA1 3d142b0bc761245820d22a8a2fc03a2dd4c6cae3 SHA256 2c7ad2c2fe5361f9f5e8dea1e4b0a12ab0702764d5c97e1908113768533347cd
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.2.0.ebuild
index 39e98c9f449..1058e178286 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-1.2.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.2.0.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild, 2010/02/04 Ronis_BR $
+# $Header: $
 
-EAPI=2
-OPENGL_REQUIRED=optional
+EAPI="2"
+
+OPENGL_REQUIRED="optional"
 KDE_LINGUAS="ar be ca cs da de el en_GB es et fi fr ga gl hi hne is it ja km
 lt lv ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
-
+KMNAME="extragear/graphics"
 inherit flag-o-matic kde4-base
 
-DESCRIPTION="KDE Image Plugin Interface"
-HOMEPAGE="http://www.kipi-plugins.org/"
-SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2"
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.kipi-plugins.org"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="4"
 KEYWORDS="~amd64 ~x86"
+SLOT="4"
 IUSE="cdr calendar crypt debug +imagemagick ipod mjpeg redeyes scanner"
 
-DEPEND=">=dev-libs/expat-2.0.1
+DEPEND="
+	>=dev-libs/expat-2.0.1
 	>=dev-libs/libxml2-2.7
 	>=dev-libs/libxslt-1.1
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
@@ -28,30 +30,31 @@ DEPEND=">=dev-libs/expat-2.0.1
 	>=media-libs/libpng-1.2
 	>=media-libs/tiff-3.6
 	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	ipod? ( x11-libs/gtk+:2
-		>=media-libs/libgpod-0.7 )
-	opengl? ( virtual/opengl
-		>=x11-libs/qt-opengl-4.3
-		>=media-libs/mesa-7.0.4 )
+	crypt? ( app-crypt/qca:2 )
+	ipod? (
+		>=media-libs/libgpod-0.7
+		x11-libs/gtk+:2
+	)
 	redeyes? ( >=media-libs/opencv-1.0 )
-	scanner? ( media-gfx/sane-backends
-		>=kde-base/libksane-${KDE_MINIMAL} )
-	crypt? ( app-crypt/qca:2 )"
+	scanner? (
+		>=kde-base/libksane-${KDE_MINIMAL}
+		media-gfx/sane-backends
+	)
+"
 RDEPEND="${DEPEND}
 	cdr? ( app-cdr/k3b )
 	imagemagick? ( >=media-gfx/imagemagick-5.5.4 )
-	mjpeg? ( media-video/mjpegtools )"
+	mjpeg? ( media-video/mjpegtools )
+"
 
-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
-}
 
-src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs+=(
 		$(cmake-utils_use_with ipod GLIB2)
 		$(cmake-utils_use_with ipod GObject)
 		$(cmake-utils_use_with ipod Gdk)
@@ -60,7 +63,8 @@ src_configure() {
 		$(cmake-utils_use_with redeyes OpenCV)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner Sane)"
+		$(cmake-utils_use_with scanner Sane)
+	)
 
 	kde4-base_src_configure
 }
diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
index f37e77d0425..600836730de 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
@@ -5,77 +5,65 @@
 EAPI="2"
 
 OPENGL_REQUIRED="optional"
-#KDE_LINGUAS="ar be ca cs da de el es et fr ga gl hi is it ja km lv ms nb nds nl
-#nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zn_CN"
+KDE_LINGUAS="ar be ca cs da de el en_GB es et fi fr ga gl hi hne is it ja km
+lt lv ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
 KMNAME="extragear/graphics"
-inherit kde4-base
+inherit flag-o-matic kde4-base
 
-MY_P="${P/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
 HOMEPAGE="http://www.kipi-plugins.org"
-#SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="2"
-IUSE="cdr calendar debug +imagemagick ipod mjpeg redeyes scanner"
+SLOT="4"
+IUSE="cdr calendar crypt debug +imagemagick ipod mjpeg redeyes scanner"
 
 DEPEND="
 	>=dev-libs/expat-2.0.1
-	dev-libs/libxml2
-	dev-libs/libxslt
+	>=dev-libs/libxml2-2.7
+	>=dev-libs/libxslt-1.1
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
 	>=kde-base/libkexiv2-${KDE_MINIMAL}
 	>=kde-base/libkipi-${KDE_MINIMAL}
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/tiff-3.5
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2
+	>=media-libs/tiff-3.6
 	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	ipod? ( media-libs/libgpod )
-	opengl? ( virtual/opengl )
-	redeyes? ( media-libs/opencv )
+	crypt? ( app-crypt/qca:2 )
+	ipod? (
+		>=media-libs/libgpod-0.7
+		x11-libs/gtk+:2
+	)
+	redeyes? ( >=media-libs/opencv-1.0 )
 	scanner? (
-		media-gfx/sane-backends
 		>=kde-base/libksane-${KDE_MINIMAL}
+		media-gfx/sane-backends
 	)
 "
 RDEPEND="${DEPEND}
 	cdr? ( app-cdr/k3b )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( >=media-gfx/imagemagick-5.5.4 )
 	mjpeg? ( media-video/mjpegtools )
 "
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# This Plugin hard depends on libksane, deactivate it if use flag scanner is
-	# not set.
-	if ! use scanner; then
-		sed -i \
-			-e '/acquireimages/ s:^:#DONOTCOMPILE :' \
-			"${S}"/CMakeLists.txt || die "Sed deactivating scanner support failed."
-	fi
-
-	# Fix linking
-	sed -i \
-		-e '/KDE4_KDEUI_LIBS/ c\\${KDE4_KIO_LIBS}'\
-		"${S}"/common/libkipiplugins/CMakeLists.txt \
-		|| die "Sed fixing kipi linking failed."
-}
-
 src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_with ipod Gpod)
+	# 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 redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner Sane)
 	)
 
 	kde4-base_src_configure
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index a15c8012498..8f0b997f849 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <use>
-	<flag name="mjpeg">Add mjpeg suppport</flag>
-	<flag name="redeyes">Add redeyes removal suppport</flag>
-	<flag name="linguas_zn_CN">Add zn_CN lingua suppport</flag>
-  </use>
+	<herd>kde</herd>
+	<use>
+		<flag name="mjpeg">Add mjpeg suppport</flag>
+		<flag name="redeyes">Add redeyes removal suppport</flag>
+	</use>
 </pkgmetadata>