Get rid of invalid aRts dependency. Correct other dependencies, bug #256299. Fix missing eclass pkg_setup call. Version bump.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 171 insertions, 2 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 07a1892d0f19..3abb0fd3d5dd 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.42 2009/01/05 14:54:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.43 2009/02/11 19:45:26 carlo Exp $
+
+*kipi-plugins-0.1.7 (11 Feb 2009)
+
+  11 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kipi-plugins-0.1.4-header.diff, +kipi-plugins-0.1.4-r2.ebuild,
+  +kipi-plugins-0.1.7.ebuild:
+  Get rid of invalid aRts dependency. Correct other dependencies, bug #256299.
+  Fix missing eclass pkg_setup call. Version bump.
 
 *kipi-plugins-0.1.6 (05 Jan 2009)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 64f5e2100a9f..5e47abc1da6e 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,8 +1,12 @@
+AUX kipi-plugins-0.1.4-header.diff 422 RMD160 1a09afcdb7175dfdd0b4cb14a17f3af9c562dbaf SHA1 bb2fac9eea4fdf9aaacce6f2de385920043281da SHA256 8fa0a98b51928fc9710c7ff2d7e12138cb2480ad1506b626be5f6912288ab6da
 AUX kipi-plugins-0.1.4-ipod-191195.patch 1100 RMD160 e93a5430f8d9e74575759a14c923cc07603728f4 SHA1 0044a5c31c9f6995d06afb93680c566ac99b1948 SHA256 ff9feba1085bbe2fdd47b3c400fdb5feea70824d2feb9559fafeac3951054191
 AUX kipi-plugins-default_chroma_opt.patch 376 RMD160 4f6f8584dae11f5646d0f8cf630bb9114cac1ea4 SHA1 34b5b3c6318e2b4b7b9236326d0ec6e1302bee36 SHA256 81f680e9efca3faa19bb051bf8a3ec9f5f17a85eaf1ef05abf96803a9cc8a7d0
 DIST kipi-plugins-0.1.4.tar.bz2 8529867 RMD160 bc8b6d0d9bc8b30afbaf5ac5ccbc4862aa3a80e2 SHA1 53d3609a257dfc0e429681438c60486cf4815fc6 SHA256 eb7ceed6eb6893ccabee1aebf5c08379199a96eade2886daf54445664c786d53
 DIST kipi-plugins-0.1.6.tar.bz2 8838095 RMD160 040c1014998f1ed15c0b160a56503ba49f40f504 SHA1 786b5863079be5804792155b02543b7db107724a SHA256 ca3f86e34a6c77db25d0c0fa8219e618ee6320cdc417e9d5e83520ff0320ff75
+DIST kipi-plugins-0.1.7.tar.bz2 8836654 RMD160 f66473c11e66f9e06aa6772c7952b640b565def9 SHA1 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 SHA256 3c8a73d0658935b75fc0e0ed48f66cd72225249152bce969f4c9676c7038124b
 EBUILD kipi-plugins-0.1.4-r1.ebuild 1600 RMD160 2f932ddd53bf80b8735370c8961b011ae611b140 SHA1 b3a4165121594108cbdafd129019e0b35665b176 SHA256 56feae0d2e837b4b5ea32f84b91737779e63b59ba22f23fcf60e040d3630934e
+EBUILD kipi-plugins-0.1.4-r2.ebuild 1552 RMD160 21987bf8fd2fc159f593bf574c3e69018c3160a1 SHA1 f4b1814b57cfb91d14227923f766591aa60938c6 SHA256 1f3ffaf163cecfd418d51463c4169a3ecbd5fdaf5ac867307bc2de40bc399865
 EBUILD kipi-plugins-0.1.6.ebuild 2165 RMD160 4db73f83090ef5c4be7e48e633e63931bbda58e9 SHA1 e87b409222ea5d8b8e52f6d25cc360cb7c8ac613 SHA256 7c916f345eb327f919cc6a611422601532344310c7a06360416ef084bdf86dfe
-MISC ChangeLog 7825 RMD160 3d7eb3bd08b2ebe8a3595b72b9282f2fe442f9c8 SHA1 8493ce9a7f38b06ff87450f5aae8f3549fe6e3a1 SHA256 5b530fc3301fbc089b408c5de3217489673ac57088fba761642818673987657d
+EBUILD kipi-plugins-0.1.7.ebuild 2204 RMD160 ce9adea7d1514ff7eb3288cd3665b7501ea19ebf SHA1 392d4594ac924984411bd3c75db2eaec732e867b SHA256 ac9bd33ae1b7055c39ebb43acaf3823de41cda5113b13b3764d132e64b7d1e81
+MISC ChangeLog 8138 RMD160 010bb56fbf5f874bef784e8cdc7e0bf7c73a1a74 SHA1 d179f4a8d73cc45025456f7e9f0350107a759825 SHA256 d75d5a321c1c3b24ee427349d4dbb5d14bf0d5cba47da6b5107a2b1642c3a29d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-0.1.4-header.diff b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.4-header.diff
new file mode 100644
index 000000000000..180285b0fdb8
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-0.1.4-header.diff
@@ -0,0 +1,13 @@
+--- kipi-plugins/gpssync/kmlexport.cpp.orig	2009-02-11 03:22:55.000000000 +0100
++++ kipi-plugins/gpssync/kmlexport.cpp	2009-02-11 03:33:58.000000000 +0100
+@@ -17,6 +17,10 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+  ***************************************************************************/
+ 
++extern "C" {
++  #include <unistd.h>
++};
++
+ // Local includes.
+ 
+ #include "kmlexport.h"
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..d4940eac9c78
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild,v 1.4 2009/02/11 19:45:26 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
+HOMEPAGE="http://www.kipi-plugins.org/"
+SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="opengl gphoto2 ipod"
+
+DEPEND=">=media-libs/libkipi-0.1.5
+		>=media-libs/libkexiv2-0.1.5
+		~media-libs/libkdcraw-0.1.1
+		gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
+		>=media-libs/imlib2-1.1.0
+		>=media-gfx/imagemagick-6.2.4
+		>=media-video/mjpegtools-1.6.0
+		opengl? ( virtual/opengl )
+		>=media-libs/tiff-3.5
+		>=dev-libs/libxslt-1.1
+		ipod? ( =media-libs/libgpod-0.6* )"
+RDEPEND="${DEPEND}
+		media-sound/vorbis-tools
+		virtual/mpg123"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${P}-ipod-191195.patch"
+	"${FILESDIR}/kipi-plugins-0.1.4-header.diff"
+	)
+
+pkg_setup(){
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "X support is required in media-libs/imlib2 in order to be able"
+		eerror "to compile media-plugins/kipi-plugins. Please, re-emerge"
+		eerror "media-libs/imlib2 with the 'X' USE flag enabled."
+		die
+	fi
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	rm -f "${S}"/configure
+}
+
+src_compile() {
+	myconf="$(use_with opengl) $(use_with gphoto2) $(use_with ipod libgpod)"
+	kde_src_compile all
+}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
new file mode 100644
index 000000000000..6994ddd13a01
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.1 2009/02/11 19:45:26 carlo Exp $
+
+EAPI=1
+
+ARTS_REQUIRED="never"
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
+HOMEPAGE="http://www.kipi-plugins.org/"
+SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="calendar opengl gphoto2 ipod tiff"
+
+DEPEND="calendar? ( || ( kde-base/libkcal:3.5 kde-base/kdepim:3.5 ) )
+		>=media-libs/libkipi-0.1.5
+		>=media-libs/libkexiv2-0.1.5
+		>=media-libs/libkdcraw-0.1.4
+		gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
+		>=media-libs/imlib2-1.1.0
+		opengl? ( virtual/opengl )
+		tiff? ( >=media-libs/tiff-3.6 )
+		>=dev-libs/libxslt-1.1
+		ipod? ( >=media-libs/libgpod-0.6.0 )"
+RDEPEND="${DEPEND}
+		>=media-gfx/imagemagick-6.2.4
+		>=media-video/mjpegtools-1.6.0
+		media-sound/vorbis-tools
+		virtual/mpg123"
+
+need-kde 3.5
+
+LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl
+	hu is it ja lt ms mt nb nds nl nn pa pl pt pt_BR
+	ru rw sk sr sr@Latn sv ta th tr uk zh_CN"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup(){
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "X support is required in media-libs/imlib2 in order to be able"
+		eerror "to compile media-plugins/kipi-plugins. Please, re-emerge"
+		eerror "media-libs/imlib2 with the 'X' USE flag enabled."
+		die
+	fi
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# remove configure script to trigger its rebuild during kde_src_compile
+	rm -f "${S}"/configure
+
+	# Set default for the -S option for images2mpeg to work correctly, bug #208133
+	epatch "${FILESDIR}/${PN}-default_chroma_opt.patch"
+
+	cd "${WORKDIR}/${P}/po"
+	for X in ${LANGS} ; do
+		use linguas_${X} || rm -f "${X}."*
+	done
+}
+
+src_compile() {
+	myconf="$(use_enable calendar)
+			$(use_enable gphoto2 kameraklient)
+			$(use_enable ipod ipodexport)
+			$(use_enable tiff acquireimages)
+			$(use_enable tiff rawconverter)
+			$(use_enable opengl imageviewer)"
+	kde_src_compile all
+}