media-libs/jpeg -> virtual/jpeg, #347969 thank Andrew Savchenko for report. Drop old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 10 insertions, 137 deletions

diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index e649a0219ef8..96e18fb0039e 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/dcraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.60 2010/09/28 13:05:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.61 2010/12/20 18:06:41 pva Exp $
+
+  20 Dec 2010; Peter Volkov <pva@gentoo.org> dcraw-8.98-r1.ebuild,
+  -dcraw-8.99.ebuild, dcraw-9.04.ebuild:
+  media-libs/jpeg -> virtual/jpeg, #347969 thank Andrew Savchenko for report.
+  Drop old.
 
 *dcraw-9.04 (28 Sep 2010)
 
diff --git a/media-gfx/dcraw/dcraw-8.98-r1.ebuild b/media-gfx/dcraw/dcraw-8.98-r1.ebuild
index afdbb1cadab7..32e3011a64c2 100644
--- a/media-gfx/dcraw/dcraw-8.98-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-8.98-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.98-r1.ebuild,v 1.6 2010/04/04 15:49:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.98-r1.ebuild,v 1.7 2010/12/20 18:06:41 pva Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls gimp jpeg lcms"
 
-COMMON_DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+COMMON_DEPEND="jpeg? ( virtual/jpeg )
 	lcms? ( media-libs/lcms )
 	gimp? ( media-gfx/gimp )"
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/dcraw/dcraw-8.99.ebuild b/media-gfx/dcraw/dcraw-8.99.ebuild
deleted file mode 100644
index 8817629312b3..000000000000
--- a/media-gfx/dcraw/dcraw-8.99.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.99.ebuild,v 1.3 2010/06/21 12:08:41 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image"
-HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/"
-SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
-	mirror://gentoo/parse-1.69.tar.bz2
-	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
-
-LICENSE="freedist GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls gimp jpeg lcms"
-
-COMMON_DEPEND="jpeg? ( >=media-libs/jpeg-8a )
-	lcms? ( =media-libs/lcms-1* )
-	gimp? ( media-gfx/gimp )"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	gimp? ( dev-util/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm"
-
-S=${WORKDIR}/dcraw
-
-LANGS="ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-
-for lng in ${LANGS}; do
-	IUSE+=" linguas_${lng}"
-done
-
-# Helper function to list only langs listed in LANGS or
-linguas_list() {
-	local nolangs=true
-	for lng in ${LANGS}; do
-		if use linguas_${lng}; then
-			nolangs=false
-			echo " ${lng}"
-		fi
-	done
-	if ${nolangs}; then
-		echo ${LANGS}
-	fi
-}
-
-run_build() {
-	einfo "${@}"
-	${@} || die
-}
-
-src_prepare() {
-	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
-}
-
-src_compile() {
-	local ECFLAGS="-O2" # Without optimisation build fails
-	local ELIBS="-lm"
-	if use lcms; then
-		ELIBS="-llcms ${ELIBS}"
-	else
-		ECFLAGS+=" -DNO_LCMS=yes"
-	fi
-	if use jpeg; then
-		ELIBS="-ljpeg ${ELIBS}"
-	else
-		ECFLAGS+=" -DNO_JPEG=yes"
-	fi
-	if use nls; then
-		ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
-	fi
-
-	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} \
-				-o dcraw dcraw.c ${ELIBS}
-
-	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} \
-				-o dcparse parse.c
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
-				$(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \
-				$(pkg-config --libs gimpui-2.0)
-	fi
-
-	if use nls; then
-		for lng in $(linguas_list); do
-			run_build msgfmt -c -o dcraw_${lng}.mo dcraw_${lng}.po
-		done
-	fi
-}
-
-src_install() {
-	dobin dcraw dcparse || die
-	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} || die
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
-		insopts -m0755
-		doins rawphoto || die
-	fi
-
-	doman dcraw.1 || die
-	if use nls; then
-		for lng in $(linguas_list); do
-			[[ -f dcraw.${lng}.1 ]] && doman dcraw.${lng}.1
-			insinto /usr/share/locale/${lng}/LC_MESSAGES
-			newins dcraw_${lng}.mo dcraw.mo || die "failed to install dcraw_${lng}.mo"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "See conversion-examples.txt.gz on how to convert"
-	elog "the PPM files produced by dcraw to other image formats."
-	elog ""
-	ewarn "The functionality of the external program 'fujiturn' was"
-	ewarn "incorporated into dcraw and is automatically used now."
-	elog ""
-	elog "There's an example wrapper script included called 'dcwrap'."
-	elog ""
-	elog "This package also includes 'dcparse', which extracts"
-	elog "thumbnail images (preferably JPEGs) from any raw digital"
-	elog "camera formats that have them, and shows table contents."
-	elog ""
-}
diff --git a/media-gfx/dcraw/dcraw-9.04.ebuild b/media-gfx/dcraw/dcraw-9.04.ebuild
index 4c04d7d9f521..23b141302abf 100644
--- a/media-gfx/dcraw/dcraw-9.04.ebuild
+++ b/media-gfx/dcraw/dcraw-9.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.04.ebuild,v 1.1 2010/09/28 13:05:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.04.ebuild,v 1.2 2010/12/20 18:06:41 pva Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls gimp jpeg lcms"
 
-COMMON_DEPEND="jpeg? ( >=media-libs/jpeg-8a )
+COMMON_DEPEND="jpeg? ( virtual/jpeg )
 	lcms? ( =media-libs/lcms-1* )
 	gimp? ( media-gfx/gimp )"
 DEPEND="${COMMON_DEPEND}