Cleanup

(Portage version: 2.1.9.35/cvs/Linux x86_64)

3 files changed, 5 insertions, 174 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index f5c47d53a5c6..3cf4de907f95 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.87 2011/01/31 11:05:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.88 2011/02/02 22:14:41 dilfridge Exp $
+
+  02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kipi-plugins-1.2.0-r2.ebuild, -kipi-plugins-1.7.0.ebuild:
+  Cleanup
 
   31 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   kipi-plugins-1.2.0-r3.ebuild:
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild
deleted file mode 100644
index d7e980f40a1e..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild,v 1.6 2010/11/01 15:21:21 fauli Exp $
-
-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="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.kipi-plugins.org"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2 mirror://gentoo/${P}-jpeg.patch.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending +imagemagick ipod mjpeg redeyes scanner"
-
-DEPEND="
-	>=dev-libs/expat-2.0.1
-	>=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-6b
-	>=media-libs/libpng-1.2
-	>=media-libs/tiff-3.6
-	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	crypt? ( app-crypt/qca:2 )
-	ipod? (
-		>=media-libs/libgpod-0.7
-		x11-libs/gtk+:2
-	)
-	redeyes? ( >=media-libs/opencv-1.0 )
-	scanner? (
-		>=kde-base/libksane-${KDE_MINIMAL}
-		media-gfx/sane-backends
-	)
-"
-RDEPEND="${DEPEND}
-	cdr? ( app-cdr/k3b )
-	expoblending? ( media-gfx/hugin )
-	imagemagick? ( >=media-gfx/imagemagick-5.5.4 )
-	mjpeg? ( media-video/mjpegtools )
-"
-
-PATCHES=( "${DISTDIR}/${P}-jpeg.patch.bz2"
-	"${FILESDIR}/${P}-expoblending.patch" )
-
-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 redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_enable expoblending)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild
deleted file mode 100644
index a267f6ca0757..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild,v 1.2 2011/01/09 13:43:39 dilfridge Exp $
-
-EAPI="2"
-
-OPENGL_REQUIRED="optional"
-KDE_LINGUAS="ar ast be ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hi hne hr is it ja km
-lt lv mai ms nb nds nl nn pa pl pt pt_BR ro ru se sv tr uk zh_CN zh_TW"
-KMNAME="extragear/graphics"
-KDE_MINIMAL="4.5"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.kipi-plugins.org"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2
-	handbook? ( mirror://gentoo/${PN}-doc-1.5.0.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending handbook +imagemagick ipod mjpeg redeyes scanner"
-
-DEPEND="
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libxml2-2.7
-	>=dev-libs/libxslt-1.1
-	dev-libs/qjson
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/tiff
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	redeyes?	( media-libs/opencv )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
-
-src_prepare() {
-	if use handbook; then
-		mv "${WORKDIR}/${PN}"-1.5.0/* "${S}/" || die
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	else
-		mkdir doc || die
-		echo >> doc/CMakeLists.txt || die
-	fi
-
-	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 redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_enable expoblending)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use handbook; then
-		dodoc readme-handbook.txt || die
-	fi
-}