From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6091213835A for ; Fri, 25 Sep 2020 19:41:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39352E080E; Fri, 25 Sep 2020 19:41:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D9F6E080E for ; Fri, 25 Sep 2020 19:41:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB737340C04 for ; Fri, 25 Sep 2020 19:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 356EA37F for ; Fri, 25 Sep 2020 19:41:11 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1601062864.9eb0c0864e6903267b49f70394c129eb525d6729.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/netpbm/Manifest media-libs/netpbm/netpbm-10.66.00.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 9eb0c0864e6903267b49f70394c129eb525d6729 X-VCS-Branch: master Date: Fri, 25 Sep 2020 19:41:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c4c025fc-e65e-46cc-a559-112c98934ba6 X-Archives-Hash: 22e45ff44c25536c7682e98d5cc60872 commit: 9eb0c0864e6903267b49f70394c129eb525d6729 Author: Aaron Bauman gentoo org> AuthorDate: Fri Sep 25 19:33:20 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Sep 25 19:41:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb0c086 media-libs/netpbm: drop old EAPI=4 Bug: https://bugs.gentoo.org/671068 Signed-off-by: Aaron Bauman gentoo.org> media-libs/netpbm/Manifest | 1 - media-libs/netpbm/netpbm-10.66.00.ebuild | 195 ------------------------------- 2 files changed, 196 deletions(-) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 71d44985689..5519fbb6b9d 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,3 +1,2 @@ -DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild deleted file mode 100644 index 3091275a3a1..00000000000 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" - -RDEPEND="jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - 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.66-jasper-hack.patch #513240 - epatch "${FILESDIR}"/netpbm-10.66-options-case.patch - epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch - epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch - epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch - epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252 - - # make sure we use system urt - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -rf urt - - # avoid mixing the local copy of jbig with the system - rm converter/other/jbig/jbig.h || 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') - jpeg2ktopam pamtojpeg2k # jasper has been removed - $(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 = NONE - 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 . -}