From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1369458-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CA07215808F
for <garchives@archives.gentoo.org>; Sun, 20 Feb 2022 05:51:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 101BBE0830;
Sun, 20 Feb 2022 05:51:50 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DDB71E0829
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Feb 2022 05:51:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0C5F73432C8
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Feb 2022 05:51:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 26E352F5
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Feb 2022 05:51:44 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1645335618.32fe5498447350c6a92de7bfa04a743bbfb6e5e8.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/graphicsmagick/Manifest media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
X-VCS-Directories: media-gfx/graphicsmagick/files/ media-gfx/graphicsmagick/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 32fe5498447350c6a92de7bfa04a743bbfb6e5e8
X-VCS-Branch: master
Date: Sun, 20 Feb 2022 05:51:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 03e7b37b-8dc2-48c0-aef2-4e7707c00c26
X-Archives-Hash: 8233ec0ae8ece4fd3031c02c1d1b37d9
commit: 32fe5498447350c6a92de7bfa04a743bbfb6e5e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:40:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:40:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fe5498
media-gfx/graphicsmagick: drop 1.3.36
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 1 -
.../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 24 ----
.../graphicsmagick/graphicsmagick-1.3.36.ebuild | 133 ---------------------
3 files changed, 158 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 559dac8e96a3..4a582fed0167 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1 @@
-DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
deleted file mode 100644
index 5a78527b2286..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
-
-Sent upstream.
-
-# User Sam James <sam@gentoo.org>
-# Date 1631846586 -3600
-# Fri Sep 17 03:43:06 2021 +0100
-magick/blob.c: Fix build with bzip2 enabled and zlib disabled
-
-Seems to be a typo.
-
-Bug: https://bugs.gentoo.org/641164
-
---- a/magick/blob.c
-+++ b/magick/blob.c
-@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
- else
- amount=(int) remaining;
-
-- bz_count=BZ2_bzwrite(blob->handle.gz,
-+ bz_count=BZ2_bzwrite(blob->handle.bz,
- (void *) ((unsigned char *) data+i),amount);
- if (bz_count <= 0)
- break;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
deleted file mode 100644
index 45f73976f1ad..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
- openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.36-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp ; then
- openmp=enable
- fi
-
- local myeconfargs=(
- --${openmp}-openmp
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_with threads)
- $(use_with dynamic-loading modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- --without-jp2
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl ; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}