Version bump. Drop unused and broken.

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

4 files changed, 142 insertions, 87 deletions

diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index 406a5a066f01..642a4e4c06ec 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2010/03/04 10:09:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.54 2010/03/04 16:14:47 pva Exp $
+
+*dcraw-8.99 (04 Mar 2010)
+
+  04 Mar 2010; Peter Volkov <pva@gentoo.org> -dcraw-8.86.ebuild,
+  +dcraw-8.99.ebuild:
+  Version bump. Drop unused and broken.
 
   04 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> dcraw-8.98-r1.ebuild:
   x86 stable wrt bug #304229
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index e503165f6d09..aec94e63a135 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -2,12 +2,12 @@ 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.73.tar.bz2 72272 RMD160 3b188c52eccca2cf8f11a6f69ed827847985f9f1 SHA1 753d856d155a24a43b93201609e854ab5abdc752 SHA256 9c3ea2a1a6af81e513d10976c4606b3f71422cca9e2261f19b0c6e5e1909b0e0
-DIST dcraw-8.86.tar.bz2 77003 RMD160 3b4378710ac8306c8fb95f8544da2e26b1cd710a SHA1 5ba092ff12fb63f8c1027fe75c55221b1d450a0e SHA256 749f68825c6526aaf1a3069f5f3c04e13d5e640999c9fd483f7d8c3331d3f088
 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 parse-1.69.tar.bz2 7931 RMD160 29200a907a60f05c3de6dcc870eb99b022bb4deb SHA1 ed693e040ff62e434381d4334ff04160540024bd SHA256 a0560aca1d5c58b6e21ab187af299fbb90ca3d56db34f33705d8d69b3de17aed
 DIST rawphoto-1.32.tar.bz2 3841 RMD160 11c6c0fd621170ec5657c8803300ade7c3c21f99 SHA1 6952d39556c3b83e1c790c6ccd34f8233cf2dd53 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c
 EBUILD dcraw-8.73.ebuild 2162 RMD160 6314a0d7fe7f5c664ef68188bc2226062f959372 SHA1 9f363eeef2f7d50ace0d88fbd9ba9ae5fd9de5b4 SHA256 3a60700ee356d52b0941eaff5dd9c02952461c06279f674c185acf9c199fb8a9
-EBUILD dcraw-8.86.ebuild 2336 RMD160 4cb7a283826ad9639bf21ef0ef60e39f3158d1ad SHA1 52aaaf28e725b3134ef081414996a1966161174f SHA256 3e2fcb9645d247cfb6aa53b6f4f61846ca845af52246e8c5ca5f8a7477e7829b
 EBUILD dcraw-8.98-r1.ebuild 3341 RMD160 aed20b7fce44c771f1d4cd8493dc1e3460e200d9 SHA1 c62ae88b5bc3479cd5f5ba492afa919b496da95c SHA256 af4c6814c2c8ba5dd12ffe3b8efa4f13eb35288e055014307f12fbe9d4949c7e
-MISC ChangeLog 6530 RMD160 9a2f7a5dda6161b30e81b41e8e17f3878678e83d SHA1 a0a047c747773f9d0dcb67de55ddc40f98266366 SHA256 cc1e1dec29b1e1d96f05b0d630b08918a7e6001c60767926eb93f5868fc95a96
+EBUILD dcraw-8.99.ebuild 3338 RMD160 846e059bebdc85d6c2b9d915ca0fedfc5288d095 SHA1 2da9927f38428f1c83ba77dc841488197c511afd SHA256 3ffa8847b8198a2782f9f9383e16126bd6906e94224dae4b7a3aa6ae2722d51a
+MISC ChangeLog 6678 RMD160 f867f1ecd2c1c066bad315a6d1163bba6028b831 SHA1 c5a071e000e1adbb3ec12e7e3339067f5de86f87 SHA256 a625fbdb09ca8a4d7e522ea6df30c19c43b91d88804808278f1d9e240726bdd7
 MISC metadata.xml 813 RMD160 d279f21ee59ab9ffcbf673791c0f2eb1518faffe SHA1 928512e9bcbc80147a1c7cf7d16be98545edf61e SHA256 f51aa74b7cff8440095882fb475ed8e18c83222af0aa02b6048ebcc572e8a702
diff --git a/media-gfx/dcraw/dcraw-8.86.ebuild b/media-gfx/dcraw/dcraw-8.86.ebuild
deleted file mode 100644
index 75103c1c53d5..000000000000
--- a/media-gfx/dcraw/dcraw-8.86.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.86.ebuild,v 1.2 2009/09/23 15:11:57 ssuominen Exp $
-
-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="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="freedist GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gimp jpeg lcms"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b )
-	lcms? ( media-libs/lcms )
-	gimp? ( media-gfx/gimp )"
-
-RDEPEND="${DEPEND}
-	media-libs/netpbm"
-
-src_compile() {
-	local mymakeopts
-	use lcms || mymakeopts="${mymakeopts} NO_LCMS=yes"
-	use jpeg || mymakeopts="${mymakeopts} NO_JPEG=yes"
-	emake CC=$(tc-getCC) ${mymakeopts} || die "make failed"
-
-	# rawphoto gimp plugin
-	if use gimp; then
-
-		# find gimptool (ugly!)
-		local gimptool=/usr/bin/gimptool
-		if [ ! -x ${gimptool} ]; then
-			gimptool=${gimptool}-2.0
-			if [ ! -x ${gimptool} ]; then
-				die "Couldn't find gimptool. Please reinstall gimp."
-			fi
-		fi
-
-		# build plugin
-		${gimptool} --build rawphoto.c || die "gimptool failed"
-
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/conversion-examples.txt doc/dcwrap
-
-	# rawphoto gimp plugin
-	if use gimp; then
-
-		# find gimptool (ugly!)
-		local gimptool=/usr/bin/gimptool
-		if [ ! -x ${gimptool} ]; then
-			gimptool=${gimptool}-2.0
-			if [ ! -x ${gimptool} ]; then
-				die "Couldn't find gimptool. Please reinstall gimp."
-			fi
-		fi
-
-		# install plugin
-		env DESTDIR="${D}" ${gimptool} --install-admin-bin rawphoto || die "gimptool failed"
-
-	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 "incoporated 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-8.99.ebuild b/media-gfx/dcraw/dcraw-8.99.ebuild
new file mode 100644
index 000000000000..6468aa96cb63
--- /dev/null
+++ b/media-gfx/dcraw/dcraw-8.99.ebuild
@@ -0,0 +1,132 @@
+# 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.1 2010/03/04 16:14:47 pva 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"
+IUSE="nls gimp jpeg lcms"
+
+COMMON_DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	lcms? ( media-libs/lcms )
+	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 ""
+}