From 8d55e104b759c2a88db9380e2892794274ab6190 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Tue, 6 Sep 2011 19:34:32 +0000 Subject: [PATCH] Version bump. Drop old. Remove unused script. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- media-gfx/dcraw/ChangeLog | 9 +- media-gfx/dcraw/Manifest | 31 +--- media-gfx/dcraw/dcraw-8.98-r1.ebuild | 132 ------------------ .../{dcraw-9.04.ebuild => dcraw-9.10.ebuild} | 10 +- .../update-dcparse-and-rawphoto-tarballs.sh | 20 --- 5 files changed, 18 insertions(+), 184 deletions(-) delete mode 100644 media-gfx/dcraw/dcraw-8.98-r1.ebuild rename media-gfx/dcraw/{dcraw-9.04.ebuild => dcraw-9.10.ebuild} (88%) delete mode 100755 media-gfx/dcraw/files/update-dcparse-and-rawphoto-tarballs.sh diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog index 9bc04e6e7e79..688048c0038e 100644 --- a/media-gfx/dcraw/ChangeLog +++ b/media-gfx/dcraw/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/dcraw # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.75 2011/04/25 22:09:10 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.76 2011/09/06 19:34:32 pva Exp $ + +*dcraw-9.10 (06 Sep 2011) + + 06 Sep 2011; Peter Volkov -dcraw-8.98-r1.ebuild, + -dcraw-9.04.ebuild, +dcraw-9.10.ebuild, + -files/update-dcparse-and-rawphoto-tarballs.sh: + Version bump. Drop old. Remove unused script. 25 Apr 2011; Hanno Boeck dcraw-8.98-r1.ebuild, dcraw-9.04.ebuild, dcraw-9.05.ebuild: diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest index e4dcc1a8fb43..977edd275fb3 100644 --- a/media-gfx/dcraw/Manifest +++ b/media-gfx/dcraw/Manifest @@ -1,34 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX conversion-examples.txt 545 RMD160 f03310a2adee83df1b883f64c122d2d72c493d6f SHA1 159c57f2feba36029c97baa182670ffb0c05c0ce SHA256 b6a5a658c550ffbd26bbc1b6e7723bced7461af234062af7d77e53441429d218 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-9.04.tar.gz 160533 RMD160 6eae28242abc3aa0b222f227fb05ff6b8ff84022 SHA1 c65a0c7bb52ccdd05c2adccf4b343f4d0caab40e SHA256 c01319ed48aa7907f7209f13b98dee93a77bf4cd407826652ff7fb466f193cc5 DIST dcraw-9.05.tar.gz 161390 RMD160 5301db44b1d5905d8cf1dd3bb4d76877b626ee17 SHA1 ff797acb2a93761d158f547c733968938b31f865 SHA256 f3ab302255662f30bc2c75f16a5c37a28f404358e9e94a197addc42ae2e3f469 -DIST parse-1.69.tar.bz2 7931 RMD160 29200a907a60f05c3de6dcc870eb99b022bb4deb SHA1 ed693e040ff62e434381d4334ff04160540024bd SHA256 a0560aca1d5c58b6e21ab187af299fbb90ca3d56db34f33705d8d69b3de17aed +DIST dcraw-9.10.tar.gz 163860 RMD160 8784cfb0046d8509adddf9dbd35c88bcd3254f21 SHA1 c43f8f760845a70f2ddb85979574c0705dbcb319 SHA256 4ff3c0bb59593a29d5846e5e6f2fd979588382255fe38d11537c9e63143759ca DIST parse-1.71.tar.bz2 8129 RMD160 bc7732b2b52cdda69b9a39d7e30cc02aff371a6b SHA1 96e74cb9e366ae17897852e231e1c764fd36d96f SHA256 58d91d4ce8533b84e6933d9cfa505b7a1b3c228e34b7e3aeae438948a42a454a +DIST parse-1.73.tar.bz2 8186 RMD160 134e3bf152d145fedd1f137f82b3f8791804310c SHA1 efdc722f858d730cf45af1417d2f6ed8ae3fe281 SHA256 51f75837b7fa7f6389f43c875ad8320c41a44c4213922dc767e16dc424462c3c DIST rawphoto-1.32.tar.bz2 3841 RMD160 11c6c0fd621170ec5657c8803300ade7c3c21f99 SHA1 6952d39556c3b83e1c790c6ccd34f8233cf2dd53 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c -EBUILD dcraw-8.98-r1.ebuild 3314 RMD160 e197477ca9331c8d6435c965d265532734a330c0 SHA1 ff9bc3e515be207d90bc705cbba2e3a25b12c4bc SHA256 8949dfeda2edce45c0f0994e38aacb4f6982695f0cac2e75272f57b6d0f6c4b5 -EBUILD dcraw-9.04.ebuild 3312 RMD160 9fac6ead8e0aa36002d509eef325d48f10cea453 SHA1 1e4bf31262869eff487c1a02e9881fef31b5ee02 SHA256 c941f8dcdb36bfa7ebf6e56a43bfc80123f604e35de3d52e219cb747dc4cc612 EBUILD dcraw-9.05.ebuild 3310 RMD160 1eb5a3cf9e023c7f0df9bc9d32ba44a10b279fef SHA1 21c5721161593a2c12d510cbbf5f0f828ad551b3 SHA256 881b9c3258c916e966dd2557dd33dcea4b67f87531f1204c4796f09f3fd0eb96 -MISC ChangeLog 9182 RMD160 33a2cc1e9bba782f0412430c92b56cfec3af25ed SHA1 63a160a664ffcaf2d6ab2a5704e544f6dc7a8349 SHA256 5b69fd1ac5d52f4536a817d651c94819d697a4e01e3d55c84ac884875bdf3286 +EBUILD dcraw-9.10.ebuild 3427 RMD160 ebdfe50d4753665b04c3a871ffeb6425b1f6868a SHA1 ef6e4345ef0165b68fe215d8525b63d53bbae380 SHA256 3dc2da26c54072247e51dc8bc085c4c93d67c195b23df4b431d85708563ecfa9 +MISC ChangeLog 9416 RMD160 16d32cc098aa36f25b8c2b7aaac4002b3096887b SHA1 bc0570d1d5ae7161614dc4fc8b93f37ddd55feb7 SHA256 dbb37516c3e7ba0fe9e2ce81a542d3b776b4523535c2bd0d65728eed5a295f3f MISC metadata.xml 813 RMD160 d279f21ee59ab9ffcbf673791c0f2eb1518faffe SHA1 928512e9bcbc80147a1c7cf7d16be98545edf61e SHA256 f51aa74b7cff8440095882fb475ed8e18c83222af0aa02b6048ebcc572e8a702 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCAAGBQJNtfELAAoJEKWIAHK7tR5CxTwP/3Y0hHhJyYc0Pyj/ygnjrkaR -Os4w/JhR8Lj2YAmwrACHJiGbfqm0NrBaMxohcohTvqnTzbRTkCPuMgGbxcZhPfU9 -jxcJ6qp7a+OJ2iauZOt4jag5D7ujq4rGAJ/WAzYL+p29qRerE3GyY/xEWK06M8Ku -bjIybmeSjN7jDtYjiRdXFWkPJ/2PkEyxrx7VqIbMA/aqupw6caUhnHJ6PxoQFGJ9 -pLuZ3EIJkun9VioHBGLZ8P27RWY4aS3Qy6T3xLNDujui8yixavcUlcXSTi578UCl -DP/OfAKPzYMgOdRML5zeCMFbsjSvyOAR1dXsYi/gAfiBqbTueAlkNcJetOuidOkN -OzDDVGqlWoNuciH/0KnVPNl7n0d/jl7v4hUg8NoGq3Hz0eiCvCeBKQdb4u5uZwts -hFigCS2SN3EoB5QI2POI0WkPE2VvhBADKnF1OkdkV/Shgb9/1FLr4JnII9/VuwR1 -+YnLF/3OiT1rfJ3f8e3SDi+0uVSqqzvJ6aCGyhZg8AXG6ksuuP07EI4hb3J9AshV -vVqSAPw+8oiBk6cZG+ZRru2cYAWsdTDgfJFeNWZYQg4L5QjSvfNvmfmDFDkBv5EC -oWWK7H5tTEVZo0YB6Ib4ylcWMr5wfY8Wbdx4NZSr20ScEMRopj2kGX0R0PZSEtOx -HqKmZcOsbSiBovxi5+zb -=94Bt ------END PGP SIGNATURE----- diff --git a/media-gfx/dcraw/dcraw-8.98-r1.ebuild b/media-gfx/dcraw/dcraw-8.98-r1.ebuild deleted file mode 100644 index 4cec779e02ec..000000000000 --- a/media-gfx/dcraw/dcraw-8.98-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2011 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.8 2011/04/25 22:09:10 hanno 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="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="nls gimp jpeg lcms" - -COMMON_DEPEND="jpeg? ( virtual/jpeg ) - 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 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.10.ebuild similarity index 88% rename from media-gfx/dcraw/dcraw-9.04.ebuild rename to media-gfx/dcraw/dcraw-9.10.ebuild index 06dc0a71eda0..e500885297a8 100644 --- a/media-gfx/dcraw/dcraw-9.04.ebuild +++ b/media-gfx/dcraw/dcraw-9.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.9 2011/04/25 22:09:10 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.10.ebuild,v 1.1 2011/09/06 19:34:32 pva Exp $ EAPI="2" @@ -9,16 +9,17 @@ 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 + 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 lcms" +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 ) @@ -63,6 +64,7 @@ src_compile() { 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} \ diff --git a/media-gfx/dcraw/files/update-dcparse-and-rawphoto-tarballs.sh b/media-gfx/dcraw/files/update-dcparse-and-rawphoto-tarballs.sh deleted file mode 100755 index 42b687962b36..000000000000 --- a/media-gfx/dcraw/files/update-dcparse-and-rawphoto-tarballs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# update parse and rawphoto tarballs - -echo "Updating parse tarbal..." -tmpdir=$(mktemp -d) -cd ${tmpdir} -for file in parse.c rawphoto.c; do - wget "http://www.cybercom.net/~dcoffin/dcraw/${file}" && \ - mkdir dcraw && \ - mv ${file} dcraw && \ - tar jcvf ${file/.c}-$(awk '/Revision:/{print $2}' dcraw/${file}).tar.bz2 dcraw - if [[ $? != 0 ]]; then - echo "Unable to update ${file}." - exit 1 - fi - cd ${tmpdir} && rm -r dcraw -done - -echo "Grab tarballs at ${tmpdir} move into $(portageq distdir) and update ebuild." -- 2.26.2