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

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

5 files changed, 13 insertions, 142 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/Manifest b/media-gfx/dcraw/Manifest
index e21d6832c98b..88c59bb7453f 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -2,13 +2,11 @@ AUX conversion-examples.txt 545 RMD160 f03310a2adee83df1b883f64c122d2d72c493d6f
 AUX dcwrap 437 RMD160 c72cc183f18df5878c84a988d0746089baae0f10 SHA1 fe7f75f15f7e0dd2cdde5f96d2a0185213974066 SHA256 fd113fe5c1005116f8e03db59fb1f505667883f237abe0c799cd5a45d6ceb0bd
 AUX update-dcparse-and-rawphoto-tarballs.sh 523 RMD160 0e98f9dbe916f16185299b38f8a58c33eca0ba30 SHA1 45942b643d78d5036edec6d4f09a22a5533fa9e5 SHA256 d5a12f5ff9248649af03f224d768cc55499c4f717024fe723893cd9189918a15
 DIST dcraw-8.98.tar.gz 154920 RMD160 76a96f89b14d67348ef6c42950ffd85051d8b987 SHA1 d6ac6dfd5c831a002e3e1ce3fc0d0c63e1e62b78 SHA256 b74e025077fa0b0f3d0047327f01fd6989df3dbbaaa8d4c46961151d6a39636d
-DIST dcraw-8.99.tar.gz 159494 RMD160 946eee9bdfb1f8c10f1e3ba8b41b82610841c033 SHA1 ecc799416b7019d2028679363e20f829d3704d54 SHA256 f8c64153998c375390cd24d9695701c7d71773d810fece8c31da2199353da570
 DIST dcraw-9.04.tar.gz 160533 RMD160 6eae28242abc3aa0b222f227fb05ff6b8ff84022 SHA1 c65a0c7bb52ccdd05c2adccf4b343f4d0caab40e SHA256 c01319ed48aa7907f7209f13b98dee93a77bf4cd407826652ff7fb466f193cc5
 DIST parse-1.69.tar.bz2 7931 RMD160 29200a907a60f05c3de6dcc870eb99b022bb4deb SHA1 ed693e040ff62e434381d4334ff04160540024bd SHA256 a0560aca1d5c58b6e21ab187af299fbb90ca3d56db34f33705d8d69b3de17aed
 DIST parse-1.71.tar.bz2 8129 RMD160 bc7732b2b52cdda69b9a39d7e30cc02aff371a6b SHA1 96e74cb9e366ae17897852e231e1c764fd36d96f SHA256 58d91d4ce8533b84e6933d9cfa505b7a1b3c228e34b7e3aeae438948a42a454a
 DIST rawphoto-1.32.tar.bz2 3841 RMD160 11c6c0fd621170ec5657c8803300ade7c3c21f99 SHA1 6952d39556c3b83e1c790c6ccd34f8233cf2dd53 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c
-EBUILD dcraw-8.98-r1.ebuild 3333 RMD160 711562b30ef6e04eecc78de84202693bafe4d3c9 SHA1 e5a640c3c4455fcf1dfde2160a9424569e39f55d SHA256 a08c6d44a402e6788e51082eaa94dddd77d9d1972a8b2393a59e0e863d1102f8
-EBUILD dcraw-8.99.ebuild 3385 RMD160 3a8310cd3fa8c671fbfed3c77bfa68a3fa2cfa55 SHA1 c1066682471c38619aefe017b998ba9c7d973725 SHA256 00c3533d57979d665ee0e679a9fbdb7474b860915824b937d84b38369e37352e
-EBUILD dcraw-9.04.ebuild 3334 RMD160 51f00cc12b389103fead9718f8ed11b8d4055dbc SHA1 8e3e3c6bc5963e91d815195991f0f5ae0b85150a SHA256 c186663d7185264768c14116884228ad9aefffd9aff6edcfa7792b30a83de5db
-MISC ChangeLog 7375 RMD160 cbe470258269a2928262a87603205a47f8c7a5e4 SHA1 6920999b9b03a26bae8ea5a75e06e6cee0adbf7f SHA256 d5bd83cb3690e09fad9cd384cfb35375db8481f026305fec990c01812efa6123
+EBUILD dcraw-8.98-r1.ebuild 3321 RMD160 d397a96f707095e99eb03ead7eec4dc81ee2371b SHA1 4e7dbf99c00f34d66030ee760861aa7f725b1632 SHA256 386f19556cab623043c9100b99d545e445ba0ca20119fcc09bf503cbd80e2c7b
+EBUILD dcraw-9.04.ebuild 3326 RMD160 fd119cf86cb5a2b3030c3872215e0e1c2ad12372 SHA1 6aa452352c258c87ff03800fe1ffaa96248cb65d SHA256 323dc95f08874bb6f13a094f07e33f29ab32f98dbb801083abecebd17c6d0b5a
+MISC ChangeLog 7574 RMD160 df6d09ac339a5362eb4419fdb035704e4d7b6a50 SHA1 5e8989b1648cced5b25acd27137dd5374f58cc04 SHA256 ef13f4576facc5b136060f092c031300b49ea4f7dca5a891745447961d6de32d
 MISC metadata.xml 813 RMD160 d279f21ee59ab9ffcbf673791c0f2eb1518faffe SHA1 928512e9bcbc80147a1c7cf7d16be98545edf61e SHA256 f51aa74b7cff8440095882fb475ed8e18c83222af0aa02b6048ebcc572e8a702
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}