Remove old

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

5 files changed, 6 insertions, 171 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 9252d2f0ecb5..460437ede07e 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.134 2011/05/09 23:13:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.135 2011/06/01 21:46:09 dilfridge Exp $
+
+  01 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krita-2.2.2.ebuild,
+  -krita-2.2.2-r1.ebuild, -files/krita-2.2.2-exiv2.patch,
+  -files/krita-2.2.2-xlibs.patch:
+  Remove old
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> krita-2.3.3.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/app-office/krita/files/krita-2.2.2-exiv2.patch b/app-office/krita/files/krita-2.2.2-exiv2.patch
deleted file mode 100644
index 0b29f8d187c6..000000000000
--- a/app-office/krita/files/krita-2.2.2-exiv2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/krita/ui/kisexiv2/kis_exif_io.cpp b/krita/ui/kisexiv2/kis_exif_io.cpp
-index 6eb7f30..c85da65 100644
---- a/krita/ui/kisexiv2/kis_exif_io.cpp
-+++ b/krita/ui/kisexiv2/kis_exif_io.cpp
-@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                 v = kmdIntOrderedArrayToExifArray(entry.value());
-             } else if (exivKey == "Exif.Image.Artist") { // load as dc:creator
-                 KisMetaData::Value creator = entry.value().asArray()[0];
-+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-                 v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
-+#else
-+                v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
-+#endif
-             } else if (exivKey == "Exif.Photo.OECF") {
-                 v = kmdOECFStructureToExifOECF(entry.value());
-             } else if (exivKey == "Exif.Photo.DeviceSettingDescription") {
-@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                 Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
-                 QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
-                 if (langArr.contains("x-default")) {
-+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-                     v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
-+#else
-+                    v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
-+#endif
-                 } else if (langArr.size() > 0) {
-+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-                     v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
-+#else
-+                    v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
-+#endif
-                 }
-             } else {
-                 dbgFile << exifKey.tag();
-+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-                 v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
-+#else
-+                v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
-+#endif
-             }
-             if (v && v->typeId() != Exiv2::invalidTypeId) {
-                 dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value();
diff --git a/app-office/krita/files/krita-2.2.2-xlibs.patch b/app-office/krita/files/krita-2.2.2-xlibs.patch
deleted file mode 100644
index 24b626905e79..000000000000
--- a/app-office/krita/files/krita-2.2.2-xlibs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN krita-2.2.2.vanilla/krita/ui/CMakeLists.txt krita-2.2.2/krita/ui/CMakeLists.txt
---- krita-2.2.2.vanilla/krita/ui/CMakeLists.txt	2010-08-21 07:38:52.000000000 +0200
-+++ krita-2.2.2/krita/ui/CMakeLists.txt	2010-11-03 23:43:28.000000000 +0100
-@@ -217,6 +217,10 @@
- 
- target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage komain ${GL_INTERFACE_LIBRARIES} )
- 
-+IF(Q_WS_X11)
-+    TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
-+ENDIF(Q_WS_X11)
-+
- set_target_properties(kritaui
-     PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
- )
diff --git a/app-office/krita/krita-2.2.2-r1.ebuild b/app-office/krita/krita-2.2.2-r1.ebuild
deleted file mode 100644
index c113421839b5..000000000000
--- a/app-office/krita/krita-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2-r1.ebuild,v 1.3 2011/03/13 08:29:22 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KOffice image manipulation program."
-
-KEYWORDS="~amd64 ~x86"
-IUSE="gmm +kdcraw openexr +pdf +tiff"
-
-DEPEND="<kde-base/kdelibs-4.6
-	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
-	>=dev-cpp/eigen-2.0.3:2
-	>=media-libs/qimageblitz-0.0.4
-	>=media-gfx/exiv2-0.16
-	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
-	opengl? ( media-libs/glew )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}"-{xlibs,exiv2}.patch )
-
-KMEXTRACTONLY="libs/"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		-DWITH_Exiv2=ON
-		-DWITH_JPEG=ON
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with gmm)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with kdcraw)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with opengl GLEW)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${ED}/usr/include/config-opengl.h"
-}
diff --git a/app-office/krita/krita-2.2.2.ebuild b/app-office/krita/krita-2.2.2.ebuild
deleted file mode 100644
index 5c8681446498..000000000000
--- a/app-office/krita/krita-2.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2.ebuild,v 1.7 2011/03/13 08:29:22 dilfridge Exp $
-
-EAPI="3"
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KOffice image manipulation program."
-
-KEYWORDS="amd64 x86"
-IUSE="gmm +kdcraw openexr +pdf +tiff"
-
-DEPEND="<kde-base/kdelibs-4.6
-	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
-	>=dev-cpp/eigen-2.0.3:2
-	>=media-libs/qimageblitz-0.0.4
-	>=media-gfx/exiv2-0.16
-	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
-	opengl? ( media-libs/glew )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-xlibs.patch" )
-
-KMEXTRACTONLY="libs/"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		-DWITH_Exiv2=ON
-		-DWITH_JPEG=ON
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with gmm)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with kdcraw)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with opengl GLEW)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${ED}/usr/include/config-opengl.h"
-}