From: Mike Frysinger Date: Wed, 29 Apr 2015 04:42:40 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=12474d4d6ee43fae45d03e63e2b70ad486a9257b;p=gentoo.git Version bump. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 45b197fb41da..f75edf9d239d 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.291 2015/04/29 04:00:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.292 2015/04/29 04:42:39 vapier Exp $ + +*netpbm-10.70.00 (29 Apr 2015) + + 29 Apr 2015; Mike Frysinger + +files/netpbm-10.70-system-libs.patch, +netpbm-10.70.00.ebuild: + Version bump. 29 Apr 2015; Mike Frysinger netpbm-10.66.00.ebuild: Handle test failures when USE=-tiff and USE=-jpeg2k #545418 by Jonathan diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index fc6ad0c8994c..f0c608b8cee0 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -13,27 +13,30 @@ AUX netpbm-10.66-jpeg-dirs.patch 722 SHA256 8cca55c06fd4f678c069a0ae3e63997a408d AUX netpbm-10.66-options-case.patch 3417 SHA256 1d286fc9da28b7cc264b6d227871e3d77f09cfa57fd680972c5147344930ae22 SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 WHIRLPOOL 6afb3df9509357060879394f3d0c175bdf5db04719280aa5f98b2bb17dee1fb29b70e8594eaa0819cb905b2d00a4b32a61822f48deb60c541942e0e593fdba35 AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad2e873fa4632c4049a00bac2 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 WHIRLPOOL 5f59c43abf70d6bc74e6ac6050e25137421f0f3fd5e75e6fb8e77c54f2fc447f26c1a0aeb23ea70dca27bd44b11fdc88fbbd8bcbc1be338acb6f601b9fdcb943 AUX netpbm-10.66-wordaccess_be_aligned.patch 942 SHA256 3a0c8120c69cd6f6f53dc51ec15944d17486e7d6d7a4cffc5a69fb2b94f863b1 SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 WHIRLPOOL 2288bf481ae97df10b56d89a022b16659dadafdf0c207bc4a5ac501f029d0b4633999691f2849f8f1692be5d9370944e6e1a501dcb082482f0b8bb9cb843ea97 +AUX netpbm-10.70-system-libs.patch 1016 SHA256 1045dd7517eceaa97d4de4547502aaa9c70bb1430dec9af3da7e842a0411b915 SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629 WHIRLPOOL 6f70ec23d478669d50bf3716bb0d90c51f447c2ae8b3f3632edc3c6600dd696db92ae98d3d94912c0405b9fa97fcd0dfda3aeaa6e49cb88712275e33c43d6de6 DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4 WHIRLPOOL cbf1efd16ac7acef1fa318454f24afbd7f68eded7343168783ce8fd5dd389b9d97e7a9237cf4d6315cdeba462c9d84fb7011ddfa2df592b1fe15f4462ca0d623 DIST netpbm-10.51.00.tar.xz 1834148 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76 WHIRLPOOL 25cbfbdd575fe1c032ce1bb700181175b1386d481990e516ce62d953b1d37091c32ca2016c487d4963af1b8c79ec04953e59181334d2a53b9d5701acedabdf2a DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf +DIST netpbm-10.70.00.tar.xz 2621612 SHA256 1268cb6801790619f6d057b964305355011dfe66247f2b71fe9978cdd7af7d93 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 WHIRLPOOL 8810a2e8d4ed6a834d6fbc2861079b4e2664f85ff2548d00f95a9c26f92d02dcebcb8d1b9c26226caba067accc41eabbe1211322607de77d61827b34a8b4c82a EBUILD netpbm-10.51.00-r2.ebuild 4876 SHA256 64ba1ded0af46f473325f4331d9c2f0bd4a01b01d2a9b13cfbd10100f6716cf1 SHA512 8a8a70195e352b5c975a74f060c6d412c781f4162aa00746c71e803bbb95c95c0487d1394b72099b52fd5b03cabb3fc13726b283905aad20028372d0f3e08537 WHIRLPOOL ad468b638a5d9ba18bf753a7cd69d1cacced523ec1ae0bece3f040f388cc1681ce40bfdb2f1109b8d5f6585eeb72a475685d78084891d8a56dd6da02ed829ba0 EBUILD netpbm-10.66.00.ebuild 5751 SHA256 72a7de874b63ffd99b50dac4509259dac135e2c0780bc566e834b341bc68ec44 SHA512 aacd7095ec5505cd4ef1f91bc4efb36dde14e254363246f2bbeecf5fd13dba34530c202d658fc00b73faa31824207f348df2523555878d918ad35097e336f8d4 WHIRLPOOL 1cb2e39487e83ceab1810e74367533b212a8a3446b841445b4605143987edc0b19ba6b62889b9fc9fdf0d53216c4e773ec323d67300076a942e50533d2869d1b -MISC ChangeLog 40979 SHA256 54d31c63bc9323ecb54145079f612c030b090f3d986d68e069baf9e1cfa28292 SHA512 00370c15e2ff01758eab1e856aa26b1167e495fd7c68b49de0bb197707022cc6460aadbb7b8c9e5316b2de0ec213815dc54a956da1ded97c555edb5f1f869e9a WHIRLPOOL 0b6e96f93576b8debdea66493a7b41f09eb2e1387d3f79517eebb6cf6fbbe8bdbb62612bf7b5f097f6c4c95fcde939b405aa9c22287c7c07d1e20386550a409d +EBUILD netpbm-10.70.00.ebuild 5451 SHA256 fa7f90b1f23e7300555101ee08c34d2becc8f2b814bd1de0ce1ae106eb55efda SHA512 e54ae5588ef077a20e031934f44c044df043bef5d96c8f9a2e52035f81cde938c0cf0dae7540d9f33baa21ec46dee0124e830a6b49baf6191fbac77c1cb836b2 WHIRLPOOL d0d739b391d7553fd876ab8bad3d3c8df731c1eec2d4aeb930f2063eff29f01146e09fdfab7bd302de41c9934b68bb183184f5cd02dace0c5a93b89191082533 +MISC ChangeLog 41144 SHA256 7058caae14c72208873f168c67baed488de929cd873af1537435037fbdc6cdd4 SHA512 67d427f8279be254ae864ff17de8942ac545e70651f3bc993f0069a719e4ad48cf0013f38458cec9763a14e34c71ef5b9dbcfc1fb40c55befa9448f2289d6eef WHIRLPOOL 9c0d3307249dea0929b903b992de5017e612c202c8e388b052c922e9e3ba0018c9b1b0ee64997fc9f3bc044139773b36ea856ebcd84daf013989ced2007b0dd2 MISC metadata.xml 261 SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b SHA512 e7bcb8f689bd7da37e414a3f33b125d52a5ec0d376e821edd58d352ffb502098fbe8b7d24c0eb073822e41a55c280f84558ca4314dd37ac20adcf6471bd712af WHIRLPOOL 9aa2223d48bacfa917affeb56dc180becb54fc612e69ce6d26496d45cc42fd1050e2a40c77957ee7f37b3e2665adc0c95f08b60fab1787d3292905f0a4c8092a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVQFdnAAoJEPGu1DbS6WIAAD8P+gLJ/CoWJuCuaG7VDkD/dWoR -5HmBYuDWQba4ta+2yjUNvKsTbJkl7rhklVst3t/x3RYZCOiVRMdIOeJCAwPgo8Bq -E/8wDj6rZoalhzH2u8gXKvbUin+/isYd9jpr3w6O3XCyEso6w4pCNQa96rw9nU/M -DmV86VGZsym1vL5PoGMWWqrBIT9QOpRxRlYZvrY5oK9rZFi7E1iyYcPBowWEZyjk -ESUOaLuyO8FjyP3AcsE9KebR/Zjo0BFDEz2G3bTptIGUU/JHCq6OPY01tEHYcjgQ -kcqVJEcx8OM16Hwu8C4Pl/avWaIxsXvf+vvbCWP143taBOhuM/XdCEQrNER4EAIE -JdaH7tqeRjT7TGKcTYQXTsErKKbKvo/ep40R0cOpWdm2gvDxMf/l618nk81sqBu0 -iPjAaklv1AbahXgmiL14CIM133tKG+aYNggzWI/TcYnC48DVnj3r7u/W9sEjM1Kf -JJhm8G5wycwq1AWY1FrUN53bKcO+LxUamuJDV8RC2YpdPNRqtogk3AoIkSwJg2To -bTqbTc+l6Mggyc4KNP0XP5xNVRaCr7Up+ikejV3IiFij4NE4MlL0wMhfEdksm3Ip -t/AYoj7Q8ACiaIV9ekdR/77WArRsGipEqnDOcOWZE2N7K0WmBo8zKeKxGFHNHWH1 -YqGjdzrai9NGj4BlT0VT -=qgN/ +iQIcBAEBCAAGBQJVQGFAAAoJEPGu1DbS6WIAgzwP+wXw7POp88d+zrmkgQA+uUAv +TfAI8J49RbsuKebNcL4qgfSJdQxR1pHgI+UbYwDvxKNgVR6CGVWqdKXReqobqiAQ +VaBrAd+1djtdntmmX3asNaEbFMF4j6+DgeV8wtrJnatF/ELdCDBhhcRUUB8asb8l +1COzf3y5Ov83u7LhYgcXrNvk7LGHQ4EKFF4i/dR3K8O33gTkUU1v0IkEuIER/Nn8 +p3yBBwocS67AWGCA5xHdMFzweSGmkt1poXKtcyey7jWhuVDa047ixuT57q/zsLVW +KYuJQ2e++3SPsk+u95P6LUqoV0FIpjcHX5RZysPwUsfzoj7gRrH0yIAfSOO7Z8pf +SoBtTJqWdrpGLy/3gKjz59Tywsi5Sspo5TH6tEsKYXSTpOVRk7RwheeGkWmFEv9Z +tlTiZHI6uFbMy1mvVSY/sogDmuGBGws19SuhH7M0Uc0G5sHM8BP2MwPwKbbUZJke +pw0DMGZITQIq0JqPpFtXR0RIBdWL3T7MKgMR/M1cKYn9zxOHbtrAQLfm7X/nxoAt +4tQ/lqleQ0kBHADzekUESvTasfwE5r9HEe5CSA6dGwe10nd048B4bLW6CQ7leSiN +FJuCUQxTa+weVx48WpzRILj0IqOtDY03OE2YjsTeLkvlHDpnvGYPAfN3wTp7TKQS +8Bb6XNhIiWFSPisCJIz5 +=ENX1 -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch new file mode 100644 index 000000000000..ef50ff2435dd --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch @@ -0,0 +1,40 @@ +when we disable the bundled libs, make sure we don't try to run install in them + +--- converter/other/jbig/Makefile ++++ converter/other/jbig/Makefile +@@ -5,7 +5,7 @@ endif + SUBDIR = converter/other/jbig + VPATH=.:$(SRCDIR)/$(SUBDIR) + +-SUBDIRS = libjbig ++SUBDIRS = + + include $(BUILDDIR)/config.mk + +@@ -35,6 +35,7 @@ SCRIPTS = + + ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB)) + JBIGLIB_DEP = $(JBIGLIB) ++ SUBDIRS += libjbig + else + # It's not our internal version; user's on his own to make sure it's built + endif +--- converter/other/jpeg2000/Makefile ++++ converter/other/jpeg2000/Makefile +@@ -5,7 +5,7 @@ endif + SUBDIR = converter/other/jpeg2000 + VPATH=.:$(SRCDIR)/$(SUBDIR) + +-SUBDIRS = libjasper ++SUBDIRS = + + include $(BUILDDIR)/config.mk + +@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB) + # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better + # be relative to the current directory. + MERGE_OBJECTS += $(JASPERLIB) ++ SUBDIRS += libjasper + endif + MERGEBINARIES = $(BINARIES) + diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild new file mode 100644 index 000000000000..1aa54bf7ddc1 --- /dev/null +++ b/media-libs/netpbm/netpbm-10.70.00.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.70.00.ebuild,v 1.1 2015/04/29 04:42:39 vapier Exp $ + +EAPI="4" + +inherit toolchain-funcs eutils multilib + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="http://netpbm.sourceforge.net/" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" + +RDEPEND="jbig? ( media-libs/jbigkit ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( media-libs/jasper ) + png? ( >=media-libs/libpng-1.4:0 ) + rle? ( media-libs/urt ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:0 ) + xml? ( dev-libs/libxml2 ) + zlib? ( sys-libs/zlib ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND} + app-arch/xz-utils + sys-devel/flex" + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} +netpbm_config() { + if use $1 ; then + [[ $2 != "!" ]] && echo -l${2:-$1} + else + echo NONE + fi +} + +src_prepare() { + epatch "${FILESDIR}"/netpbm-10.31-build.patch + epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530 + epatch "${FILESDIR}"/netpbm-10.70-system-libs.patch + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # disable certain tests based on active USE flags + local del=( + $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') + $(usex rle '' 'utahrle-roundtrip') + $(usex tiff '' 'tiff-roundtrip') + ) + if [[ ${#del[@]} -gt 0 ]] ; then + sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die + fi + del=( + pnmtofiasco fiascotopnm # We always disable fiasco + $(usex jbig '' 'jbigtopnm pnmtojbig') + $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') + $(usex rle '' 'pnmtorle rletopnm') + $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') + ) + if [[ ${#del[@]} -gt 0 ]] ; then + sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die + sed -i '/^$/d' test/all-in-place.ok || die + fi + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + + # avoid ugly depend.mk warnings + touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF + # Misc crap + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config jpeg) + PNGLIB = $(netpbm_config png) + ZLIB = $(netpbm_config zlib z) + LINUXSVGALIB = $(netpbm_config svga vga) + XML2_LIBS = $(netpbm_config xml xml2) + JBIGLIB = $(netpbm_config jbig) + JBIGHDR_DIR = + JASPERLIB = $(netpbm_config jpeg2k jasper) + JASPERHDR_DIR = + URTLIB = $(netpbm_config rle) + URTHDR_DIR = + X11LIB = $(netpbm_config X X11) + X11HDR_DIR = + EOF + # cannot chain the die with the heredoc above as bash-3 + # has a parser bug in that setup #282902 + [ $? -eq 0 ] || die "writing config.mk failed" +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/bin/{doc.url,manweb} || die + rm -r "${ED}"/usr/man/web || die + rm -r "${ED}"/usr/link || die + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + dodir /usr/share + mv "${ED}"/usr/man "${ED}"/usr/share/ || die + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + use doc && dohtml -r userguide + dodoc README + cd doc + dodoc HISTORY Netpbm.programming USERDOC + dohtml -r . +}