Require SLOT="0" of media-libs/jpeg for headers.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 8 insertions, 46 deletions

diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog
index 7b9dee011a16..1ab28789ceb0 100644
--- a/media-libs/libmng/ChangeLog
+++ b/media-libs/libmng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.67 2010/01/15 09:39:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.68 2010/01/22 17:02:26 ssuominen Exp $
+
+  22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> libmng-1.0.10.ebuild:
+  Require SLOT="0" of media-libs/jpeg for headers.
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> libmng-1.0.10.ebuild:
   Transfer Prefix keywords
diff --git a/media-libs/libmng/libmng-1.0.10.ebuild b/media-libs/libmng/libmng-1.0.10.ebuild
index 85fc87977fa1..b480dfd16bb1 100644
--- a/media-libs/libmng/libmng-1.0.10.ebuild
+++ b/media-libs/libmng/libmng-1.0.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.10.ebuild,v 1.9 2010/01/15 09:39:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.10.ebuild,v 1.10 2010/01/22 17:02:26 ssuominen Exp $
+
+EAPI=1
 
 WANT_AUTOCONF=2.5
 WANT_AUTOMAKE=1.9
@@ -15,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms"
 
-DEPEND=">=media-libs/jpeg-6b
+DEPEND=">=media-libs/jpeg-6b:0
 	>=sys-libs/zlib-1.1.4
 	lcms? ( >=media-libs/lcms-1.0.8 )"
 
diff --git a/media-libs/libmng/libmng-1.0.9-r1.ebuild b/media-libs/libmng/libmng-1.0.9-r1.ebuild
deleted file mode 100644
index 46396cc23d26..000000000000
--- a/media-libs/libmng/libmng-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.9-r1.ebuild,v 1.15 2008/05/31 16:41:26 drac Exp $
-
-WANT_AUTOCONF=2.5
-WANT_AUTOMAKE=1.9
-inherit autotools
-
-DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
-HOMEPAGE="http://www.libmng.com/"
-SRC_URI="mirror://sourceforge/libmng/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="lcms"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4
-	lcms? ( >=media-libs/lcms-1.0.8 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ln -s makefiles/configure.in .
-	ln -s makefiles/Makefile.am .
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-jpeg $(use_with lcms) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc CHANGES README*
-	dodoc doc/doc.readme doc/libmng.txt
-	doman doc/man/*
-}