4 files changed, 11 insertions, 71 deletions
diff --git a/media-libs/libiptcdata/ChangeLog b/media-libs/libiptcdata/ChangeLog
index d7cc9ecd976a..727fbf59630a 100644
--- a/media-libs/libiptcdata/ChangeLog
+++ b/media-libs/libiptcdata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libiptcdata
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/ChangeLog,v 1.23 2010/11/05 20:10:55 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/ChangeLog,v 1.24 2011/11/26 13:04:30 eva Exp $
+
+  26 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -libiptcdata-1.0.2.ebuild, -libiptcdata-1.0.3.ebuild,
+  libiptcdata-1.0.4.ebuild:
+  Clean up old revisions. Depend on python-2 only per last comment in bug
+  #313531.
 
   05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   libiptcdata-1.0.4.ebuild:
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.2.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.2.ebuild
deleted file mode 100644
index 4269293d6eb6..000000000000
--- a/media-libs/libiptcdata/libiptcdata-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.2.ebuild,v 1.14 2010/01/01 12:53:08 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="library for manipulating the International Press Telecommunications
-Council (IPTC) metadata"
-HOMEPAGE="http://libiptcdata.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="doc nls python"
-
-RDEPEND="python? ( dev-lang/python )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_compile () {
-	econf $(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable doc gtk-doc)
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.3.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.3.ebuild
deleted file mode 100644
index 61e3c0f6cd50..000000000000
--- a/media-libs/libiptcdata/libiptcdata-1.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.3.ebuild,v 1.2 2010/01/01 12:53:08 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="library for manipulating the International Press Telecommunications
-Council (IPTC) metadata"
-HOMEPAGE="http://libiptcdata.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc nls python"
-
-RDEPEND="python? ( dev-lang/python )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.13.1 )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_compile () {
-	econf $(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable doc gtk-doc)
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed."
-}
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
index 43fcb06f9e1c..8bc8342b18f6 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild,v 1.12 2010/11/05 20:10:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild,v 1.13 2011/11/26 13:04:30 eva Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="doc examples nls python"
 
-RDEPEND="python? ( dev-lang/python )
+RDEPEND="python? ( =dev-lang/python-2* )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.13.1 )