Use readme.gentoo.eclass, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 49 insertions, 285 deletions

diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index aee5d8b9a2c8..5819424eb2a6 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/dcraw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.87 2013/03/03 16:55:47 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.88 2013/10/15 19:03:04 pacho Exp $
+
+  15 Oct 2013; Pacho Ramos <pacho@gentoo.org> -dcraw-9.05.ebuild,
+  -dcraw-9.12.ebuild, dcraw-9.17.ebuild:
+  Use readme.gentoo.eclass, drop old
 
   03 Mar 2013; Wolfram Schlich <wschlich@gentoo.org> metadata.xml:
   removed myself from metadata.xml
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 869c38bec0db..9bb28c9f5e18 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,15 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conversion-examples.txt 545 SHA256 b6a5a658c550ffbd26bbc1b6e7723bced7461af234062af7d77e53441429d218 SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9 WHIRLPOOL f0b26fe656b1e0977b5af85d3787a86954da207eb9c731058d6d6cc7faecf436b9c39d5c78fe63ab60e5d185aa6f5e3254357b5bc7311abc153a7b2d92e8e858
 AUX dcwrap 437 SHA256 fd113fe5c1005116f8e03db59fb1f505667883f237abe0c799cd5a45d6ceb0bd SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e WHIRLPOOL 99b483bf0a09ae7b49ea45d1fd45e354f3e59e8964b3c858cccba1875cacffb88d314a2767ed134357018b3d38ae38e46e9e2ba844d8ee6c51d2a27ca9adccb2
-DIST dcraw-9.05.tar.gz 161390 SHA256 f3ab302255662f30bc2c75f16a5c37a28f404358e9e94a197addc42ae2e3f469
-DIST dcraw-9.10.tar.gz 163860 SHA256 4ff3c0bb59593a29d5846e5e6f2fd979588382255fe38d11537c9e63143759ca
-DIST dcraw-9.12.tar.gz 164386 SHA256 9892b013d2190b858dea380a94e7f5c30318a068237e7bef8eb6a8aefc6bd691 SHA512 b864fd0a9f3f181b035b0a975bc098f0e01c1c88249ec775fbf05367510e05588e22ca38112c7d6c2f68fc73e8e696d55eb03de38bd439643bc8fc846fd41f84 WHIRLPOOL f9167641f47542868ce4909359b4b4e3b6c905d0e91844459e439fc83e772f35743deddb097e36d52e6198ebabd79ff13a1b106a96570d7cc91403a433677249
+DIST dcraw-9.10.tar.gz 163860 SHA256 4ff3c0bb59593a29d5846e5e6f2fd979588382255fe38d11537c9e63143759ca SHA512 959210b08c45e91a2d5b89bcae9dfeaccfc9f22d8ed73efa1786546898c2ce1b81ef87917b2427bc16ac9fa8583657a7c1c1da22b36421fbb3170a1b74ec2f2a WHIRLPOOL 4709f87f191f92259b87adb23b70604c2956aeeb7d855e090e2623460e145d817190144146fe52339cbe9f5bd6e88d4556f261d81eaafc17c605bc98879eec31
 DIST dcraw-9.17.tar.gz 167138 SHA256 db73bf9f8e4574fcdc6cd8ed4e781a1d0f87d909bb0fe26fce8c87a467ee7a51 SHA512 a4b58e8c75e6c44180af056fe85b1602549a1722be4430b2fee8423d33b3ce48566bb770cbec3c14e2502ca600318c9a55781083a16339f9d1a7c5159f37202e WHIRLPOOL fd130a6048e64971948009cd3c553486f5dac0e6a7c2a8e96224f138887da5cc435f416e0a6adccc4887bd71dc3ef74a5fd600a165b650e491507336d169adbd
-DIST parse-1.71.tar.bz2 8129 SHA256 58d91d4ce8533b84e6933d9cfa505b7a1b3c228e34b7e3aeae438948a42a454a
 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.05.ebuild 3310 SHA256 fe530b191e144a90f72707d8d18a61816b0871bbec8458c559a28c12849dd7f1 SHA512 5b2c63b9a4a494044456f544c82fcf0b87d51e97ab903a4ec1e007aa7b662b15592d75ddc92b7ab8bbe7f46cd9a0036967bc8cbd0d450954bb573ba7cc2944c4 WHIRLPOOL f6f2cb0efec5c326e73ddac683d6c9b3183db817462a1b669790d3cee8f1ad9a6b87b9aed117ecafd411c764a943db0b6b2740b847976e545d996a387ebd674e
 EBUILD dcraw-9.10.ebuild 3420 SHA256 867473a0fe9d1aaa07c1e18ea31412530c911e9103ae368000046728a144fb95 SHA512 2037971f6f2842acec428e11d83d20e1696588d36d866b2e65084c4d74ffdf0f42997ce2c612be5b53f183a96b4d9b7b08ad7eb605b689b851118d749b63cd91 WHIRLPOOL 7e476e461d124386c508f4d07e4c47bb94edc9d8dc54eeb7800a416a33d81ef016e6ede7522a0f9bdbc87e45225869936358149aab0dd808c68c18d32ae3c28a
-EBUILD dcraw-9.12.ebuild 3426 SHA256 82d016ebe83f003e2a5cb2f89a38021b710e1f63b168b78f9ed8353fdb5b8f05 SHA512 183dc43ca0d04c1ff7554c952c9472f50a1b4b1290804a3935672809ed5f56738bdb54a9eae6cbc59ef7b78e7d9aeca9b40242ac4f53c73d2ad86655dcb94d0c WHIRLPOOL 8019e55429297bc90d1b8af419ac37cfe2494d92aca4d770f7e41b6e43e48a49c296204bff6c2a0cb6a81be4d9e208a89387889bccfd944931157dfa0d301d13
-EBUILD dcraw-9.17.ebuild 3426 SHA256 af50c55859671c9d07eba644a89a99a3ed64252afcfb077f7142dc5b73ea7427 SHA512 bb68a8bd1bef4e9b2dba251448c708b95503c6ab539eb0ce3ec7039ea733f9cb946fd780f75b7e5c6d55ebd65f239163a523a4725ae57eb7beb5c0cf4131e270 WHIRLPOOL 43b0edebd67cc5288a69774bf92231641d53da3711f006347f490f7a3838cf23d5acb9d3cba70c66d9bdad048ec702ab1daef407da80163e2881a0a7700dbcab
-MISC ChangeLog 10650 SHA256 5f469a893c37441aa98c0f9ee00c5f038a408f6f542e49efbec8af8da6ef5106 SHA512 5e405b9b120e8051d1fd751b07345cc9f7f1309fcd2c9a35e692f00400368a5dbd42f00af2d520826c3237ddc02b1ac02c7714d2b7f8c3ff5a24dbdc754f1e5b WHIRLPOOL 2eb8070c1e3aabf0bf21aa272343861062dd8abe2cfd00ecaa2c882e9190eeb21bcbd12c1907dc08a5c6b8fae13f28211e7d729e76c687c4252bb053f6f412db
+EBUILD dcraw-9.17.ebuild 3347 SHA256 659bebd5e75dfe4031f2de08ba52b48b42b3bc122b5ffb0f805ee98638716336 SHA512 dc760a54fc82a14211f88250bc139bbd069ce95e7ee323af9cb8bfd97ae3f679334b5f59a1094467f3b46e05ab6f26381078912dd1eda27d49ded754117dfafc WHIRLPOOL 6468d4104c7c5fd8db6cb4f135b1d9159c2357e45fe4351486aaa24bc5569a85c283e71d380f060c6bc929a7db539af793373d5b985bd68628fec3fe64231196
+MISC ChangeLog 10792 SHA256 ae25a92c1038f5e5ae3a08d915d38b3fc88c54f375d184720eff91c024e71370 SHA512 0c11635b7428160bbd158a9f0ffee07b46d0d325fbd2351941e2b5d92252d1083d2229721f23e3d3139cb36089014fe3ab19e4e5294b73d7b74587da2970ec24 WHIRLPOOL 6e46f8540be003be23ecb5b0428b67eca8f02e50d3327e946c0ac48d5ff02fd8075eecb190e89b27e5eff9719446d990aeb1b267ce6e64d5fae1475731fc511a
 MISC metadata.xml 639 SHA256 20146ba50ceb3e6afcf905a0b98ab830c42c0fdf0acfee3c72bddc374cc1f9d6 SHA512 2a48c865192bbc73d36ad350462345ef38f6e49cdbb12f7bba81f1aeb2247162dd235f43be19b1b0b45ad5c1732c950b5f85901aecf4314d9fd1a79fba0935ec WHIRLPOOL 038b20a5632f3fbce869512aa1e779b8fc1312afef869d6e01bd382aca384f53245a4a9e512ffd5d862dabc6e477ecaf098e7b8983f8f5adeecf5d2036e3e0a4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJdkWkACgkQCaWpQKGI+9TgwQCeNphxYI84MkSFsOG8ddsnSfT2
++SMAoIg+HFxlus+qYvrm7WWavL5O+T9W
+=enYX
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/dcraw/dcraw-9.05.ebuild b/media-gfx/dcraw/dcraw-9.05.ebuild
deleted file mode 100644
index c62cc7cc6aed..000000000000
--- a/media-gfx/dcraw/dcraw-9.05.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.05.ebuild,v 1.9 2012/05/05 07:00:19 jdhore 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.71.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"
-IUSE="nls gimp jpeg lcms"
-
-COMMON_DEPEND="jpeg? ( virtual/jpeg )
-	lcms? ( =media-libs/lcms-1* )
-	gimp? ( media-gfx/gimp )"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	gimp? ( virtual/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"
-
-	use lcms && ELIBS="-llcms ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
-	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=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 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.12.ebuild b/media-gfx/dcraw/dcraw-9.12.ebuild
deleted file mode 100644
index 463f4408c2ea..000000000000
--- a/media-gfx/dcraw/dcraw-9.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.12.ebuild,v 1.1 2012/06/11 08:56:10 xmw 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.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"
-IUSE="nls gimp jpeg jpeg2k lcms"
-
-COMMON_DEPEND="jpeg? ( virtual/jpeg )
-	lcms? ( =media-libs/lcms-1* )
-	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
-
-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"
-
-	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 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.17.ebuild b/media-gfx/dcraw/dcraw-9.17.ebuild
index 0ccf7ab5db32..68934281c6a4 100644
--- a/media-gfx/dcraw/dcraw-9.17.ebuild
+++ b/media-gfx/dcraw/dcraw-9.17.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.17.ebuild,v 1.1 2013/01/24 09:57:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.17.ebuild,v 1.2 2013/10/15 19:03:04 pacho Exp $
 
-EAPI="2"
-
-inherit eutils toolchain-funcs
+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/"
@@ -17,15 +16,19 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
-COMMON_DEPEND="jpeg? ( virtual/jpeg )
-	lcms? ( =media-libs/lcms-1* )
+COMMON_DEPEND="
+	jpeg? ( virtual/jpeg )
+	lcms? ( media-libs/lcms:0 )
 	jpeg2k? ( media-libs/jasper )
-	gimp? ( media-gfx/gimp )"
+	gimp? ( media-gfx/gimp )
+"
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )
-	gimp? ( virtual/pkgconfig )"
+	gimp? ( virtual/pkgconfig )
+"
 RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm"
+	media-libs/netpbm
+"
 
 S=${WORKDIR}/dcraw
 
@@ -35,6 +38,19 @@ for lng in ${LANGS}; do
 	IUSE+=" linguas_${lng}"
 done
 
+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.
+"
+
 # Helper function to list only langs listed in LANGS or
 linguas_list() {
 	local nolangs=true
@@ -88,17 +104,18 @@ src_compile() {
 }
 
 src_install() {
-	dobin dcraw dcparse || die
-	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} || die
+	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 || die
+		doins rawphoto
 	fi
 
-	doman dcraw.1 || die
+	doman dcraw.1
+
 	if use nls; then
 		for lng in $(linguas_list); do
 			[[ -f dcraw.${lng}.1 ]] && doman dcraw.${lng}.1
@@ -106,20 +123,6 @@ src_install() {
 			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 ""
+	readme.gentoo_create_doc
 }