Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 126 insertions, 10 deletions

diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index b28bdf0944f6..4c0985349a48 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/dcraw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.90 2014/01/21 21:42:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.91 2014/06/18 23:57:17 radhermit Exp $
+
+*dcraw-9.21 (18 Jun 2014)
+
+  18 Jun 2014; Tim Harder <radhermit@gentoo.org> +dcraw-9.21.ebuild:
+  Version bump.
 
 *dcraw-9.20 (21 Jan 2014)
 
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index fa72bd1d7315..a7e0f22b4a03 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -7,22 +7,24 @@ DIST dcraw-9.10.tar.gz 163860 SHA256 4ff3c0bb59593a29d5846e5e6f2fd979588382255fe
 DIST dcraw-9.17.tar.gz 167138 SHA256 db73bf9f8e4574fcdc6cd8ed4e781a1d0f87d909bb0fe26fce8c87a467ee7a51 SHA512 a4b58e8c75e6c44180af056fe85b1602549a1722be4430b2fee8423d33b3ce48566bb770cbec3c14e2502ca600318c9a55781083a16339f9d1a7c5159f37202e WHIRLPOOL fd130a6048e64971948009cd3c553486f5dac0e6a7c2a8e96224f138887da5cc435f416e0a6adccc4887bd71dc3ef74a5fd600a165b650e491507336d169adbd
 DIST dcraw-9.19.tar.gz 170000 SHA256 bb01e58e02aec64ecb05806a12a7bb8f1f84962668b4247853fba4ebb6925874 SHA512 16597d92e53b16d0efa3da77a8a269dea5308028c1a4a7ef61f2c6e069ccab8aea7bfb95126c1fef63382df9d9e8e52a48f6d67b8aa826de947712c053c9961d WHIRLPOOL 99b0709ab1a35003cd157fd68c63285edfcfe27673043049120bdff93ed6a7809d6c1ae3d2cdfe9a9e1882495a088dd9c472d1d97400bc0358db412354511512
 DIST dcraw-9.20.tar.gz 171177 SHA256 bdfa98f75dfc996c4c63e75a03fe0579e15a918c39f99c19df461aaf8b160d90 SHA512 73ed22f7839a53c9747384a7aa95c6c6931a84cc21b5927f2e6b98ee1241baac85c9028271f3bf9b18e1f591d7d61539aaff3ea92d757d8d46de631f070ec019 WHIRLPOOL 3f9a4551515fba322ccd2aad8021cdb5bf1edbb1d2006660b362b165a362282524e6e575909df41f94e76cbd5e52fc04d2e69670f85435151e15275015f53249
+DIST dcraw-9.21.tar.gz 360512 SHA256 902a91b44e3e4f1b733fbd3e4f8560b53f2602231815466b91502ec4a0242a7f SHA512 3759dff0a2c8f5d056b043ae4b8dce0e4a17a2c2b665f6a46249841a3801b15ab4c60c21d2d3536648e0b663c757f2cab1a53aef6b122c3e3171efed470b2f34 WHIRLPOOL bb70f31bd014f39429617a62ac94978a9914500bb2ffc1be2893fe1dcc133c59424a848623b9cf2e5c6166a668607cd9e38cd13475c269f08e4299aef948d56d
 DIST parse-1.73.tar.bz2 8186 SHA256 51f75837b7fa7f6389f43c875ad8320c41a44c4213922dc767e16dc424462c3c SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c WHIRLPOOL 1abc642a60f3f5b54efa29722ff7674457b88811ef25e557b7823ff05f6ee55989e35c0b9dad04d74c769bcca1cb45f580985de92bb4e40cd63b6d0a35b3a0e2
 DIST rawphoto-1.32.tar.bz2 3841 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56 WHIRLPOOL af840eae74d74f83b7874a769e30ff0e613a5f1dba4d20fa315f6d9685fabffbe804ad878174f3ee274a6083105f1baa317f52b346afb493c34cea0e5c09c566
 EBUILD dcraw-9.10.ebuild 3420 SHA256 867473a0fe9d1aaa07c1e18ea31412530c911e9103ae368000046728a144fb95 SHA512 2037971f6f2842acec428e11d83d20e1696588d36d866b2e65084c4d74ffdf0f42997ce2c612be5b53f183a96b4d9b7b08ad7eb605b689b851118d749b63cd91 WHIRLPOOL 7e476e461d124386c508f4d07e4c47bb94edc9d8dc54eeb7800a416a33d81ef016e6ede7522a0f9bdbc87e45225869936358149aab0dd808c68c18d32ae3c28a
 EBUILD dcraw-9.17.ebuild 3347 SHA256 659bebd5e75dfe4031f2de08ba52b48b42b3bc122b5ffb0f805ee98638716336 SHA512 dc760a54fc82a14211f88250bc139bbd069ce95e7ee323af9cb8bfd97ae3f679334b5f59a1094467f3b46e05ab6f26381078912dd1eda27d49ded754117dfafc WHIRLPOOL 6468d4104c7c5fd8db6cb4f135b1d9159c2357e45fe4351486aaa24bc5569a85c283e71d380f060c6bc929a7db539af793373d5b985bd68628fec3fe64231196
 EBUILD dcraw-9.19.ebuild 3125 SHA256 0255abe168baad597eeef367e1d7b13bf7f244fa0c61fb3a420a296ae8d89f21 SHA512 45bdeac4d46f3143a3f09e13b4929597fddd31aeed956e28b1255509d684857eed0dd8e3d518c9185ebce8d8b94c511de8d032ca43b6aa3631cc1632a2358f48 WHIRLPOOL acbb03092725ef563ad458849b6660a26245d770196750585689ee5ab634aa8dc4d43ee3ff6cc0ad33110961a1328b6e877194fb86d7a2076dcd3e26fd19e5aa
 EBUILD dcraw-9.20.ebuild 3125 SHA256 6b9bea1635afa73536b3d31177e9a4928b7f83c6c7eebc6aaa3247783fe7f4b0 SHA512 dc571af1b28a47dc7e5b517c58c53f6f9c4f21f417ef808248371f8f2a6d79c6cf2afaefba7fc2ce7ca48b7de77d0164ab0be3f99bea29f252b3ccf0482e7e85 WHIRLPOOL 8e607b52b58c42da54f775f6d24afb7ee5fb66ca9f9d4f0e0f85c45e2a8ff9d536335440fa6d5e25001a3f67574d66d76c3b1c7f2fd02f3d4a71d1fff59d5cc0
-MISC ChangeLog 11078 SHA256 8ba424ad63e2e1dc4005008d76e5420ca4f695cc3e576229e50216543c2d5232 SHA512 110af02038524ae4ac6f718d80887633968f6018b0ff60b58465454a4ff058f8b5f8fae7a2f49b11793dde47e0e69a9e2684673f1c09229cf7c446c7b1ceacb0 WHIRLPOOL 3a8d97e00b0cc4858af59c690f5c6e9181c87f937eaa18bb3e2e826d29b2f4efce3260fdf77d174e2cec5966d6aba082f65bfbf08ec20fa9c4ad5596deb6391a
+EBUILD dcraw-9.21.ebuild 3125 SHA256 94ffed6764461db0179c67732884a5c4b55fb6db1e5c7863206b7317a43251a7 SHA512 58feac61e4aded27c3fb8f97f7dcf2cfe72a787f1d875540cb791ea98309e72c4ccd466a71a9c61f3d20109b11117cdfd88ac066615218e6f897e39d9270d799 WHIRLPOOL 5804a516e8a39347121c889926abc74f78c0201ee34d3af72373ab74f8d7500e32c859010d7c54cc508796136d024c3b725cbbcf35bfaeadc51c3b59768ff7f2
+MISC ChangeLog 11191 SHA256 cac5c890fc5ef8d895b02b55bf0d6de4749b65ff0e47f0f57324a3899a7ab162 SHA512 a15c85127e8787e56a8c2b02810eea0ac61c7e2de63d598c6ecdf97b75383570808d3109440d0b793234278af47ea940d9a3b1c13deeec820635706d7bfa697b WHIRLPOOL bb36642763c1cf3a480e1d828109dcb1dec966e0d17b72f94c7597fab77ec3860d3274514042edb206285f25dad53eda76db776b23af3c001c48b93ed5672d92
 MISC metadata.xml 674 SHA256 e90c020e0897c7b73dfb4ae2863ced04abc993afc006919f08774e891a11e13c SHA512 a00ddeec4bd6fce6993bae008c60df953a2e832e56f843291cceb16ef91a40563ef3b358c7f484d4d27cb2f397202551340e5f56079d3eb75809eeff1617c976 WHIRLPOOL 06d06834d37b8f5b15bafe698a7844d5b20a69a9893bc75415e72d2f80cead04840504185e1bc642f745b3d587d92a4dcaa2dc778282b5b9ac927fec09ec4383
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJS3um8AAoJEEqz6FtPBkyj5gAIAKiZimeIwBpHKus3MVybBTic
-f/FroFN8anqt/9Zzy0s0nYxfMdrPCgBrzSY3jiFF4kEdMMjBQiMRB0AcPwaYDEzA
-vPhh0bbRiLWptr/Ihxpo8z2ZpF4M5Nwcgl9YvYUSaltVQSJMeU4DfxBbb881ZrON
-ObkDaMYACHZMr+LY5WKo0SWbswklDsztzxjhGD7GWBFqBROKckj8hgmM3wg24AHp
-BTc6J7PaG/E1qvq2g5diSZwApT3Fa4ZWLEfmFwVzWB+XGlQaaSxJy44zBdBpmmj8
-mNBFALyXOiwc3TRdmf/HPv1Ly32ibZKADpRo4Aubl51PXQRyD/6k1du5493dYjA=
-=YO9+
+iQEcBAEBCAAGBQJToidiAAoJEEqz6FtPBkyjue8H+wVhMCzWUpdNK6ZlT63WRePW
+MxQ1+Y+3WddFBTP5lncmxz7gSTuy/wUWQ7xipheCahxg3bkHoMpWQtMGKbUIItqm
+y0BLWDwtlMQYN8u+N70I+1sq0UEtbYbKxiKZU7Cq6WvQ8J8wuINP8OqvcwRoFmRm
+k5qFMeiudCe+QU9QEmtNT71YjcuHB8mglcdy9SdWn/rNCNPdodGrkPvj6cFzVSkN
+993lDmXAMAY3Jxavdz/p+yq/vZLf7CUvAKMuod4/JpiuvHiUVle0ujc0LbraOIjH
+M/wMmDySUst+YDkUnA7cL6u2Rp3ICju9pW2AoWnKC19POoHs0nBKddSUPQuXec8=
+=xfms
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/dcraw/dcraw-9.21.ebuild b/media-gfx/dcraw/dcraw-9.21.ebuild
new file mode 100644
index 000000000000..f666f74f8750
--- /dev/null
+++ b/media-gfx/dcraw/dcraw-9.21.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.21.ebuild,v 1.1 2014/06/18 23:57:17 radhermit Exp $
+
+EAPI=5
+inherit eutils readme.gentoo 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.73.tar.bz2
+	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
+IUSE="nls gimp jpeg jpeg2k lcms ${LANGS// / linguas_}"
+
+COMMON_DEPEND="
+	jpeg? ( virtual/jpeg )
+	lcms? ( media-libs/lcms:0 )
+	jpeg2k? ( media-libs/jasper )
+	gimp? ( media-gfx/gimp )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	gimp? ( virtual/pkgconfig )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/netpbm
+"
+
+S=${WORKDIR}/dcraw
+
+DOC_CONTENTS="
+	See conversion-examples.txt.gz on how to convert
+	the PPM files produced by dcraw to other image formats.\n
+
+	\nThe functionality of the external program 'fujiturn' was
+	incorporated into dcraw and is automatically used now.\n
+
+	\nThere's an example wrapper script included called 'dcwrap'.
+	This package also includes 'dcparse', which extracts
+	thumbnail images (preferably JPEGs) from any raw digital
+	camera formats that have them, and shows table contents.
+"
+
+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"
+
+	use lcms && ELIBS="-llcms ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
+	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
+	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
+	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
+
+	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 lang in ${LANGS}; do
+			use linguas_${lang} && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+		done
+	fi
+}
+
+src_install() {
+	dobin dcraw dcparse
+	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
+		insopts -m0755
+		doins rawphoto
+	fi
+
+	doman dcraw.1
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use linguas_${lang}; then
+				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
+				insinto /usr/share/locale/${lang}/LC_MESSAGES
+				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
+			fi
+		done
+	fi
+
+	readme.gentoo_create_doc
+}