From f12b8ad09be64a20685b7c87fdb4dbbc2b7f8a56 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 2 Oct 2022 04:12:40 +0100
Subject: app-text/poppler-data: fix extra file paths

Closes: https://bugs.gentoo.org/844115
Closes: https://bugs.gentoo.org/851141
Closes: https://bugs.gentoo.org/873889
Fixes: f7d3daf96af5d450b3f983df77129c5aeac3c376
Signed-off-by: Sam James <sam@gentoo.org>
---
 app-text/poppler-data/Manifest                     |  2 +-
 .../poppler-data/poppler-data-0.4.11-r1.ebuild     | 27 ----------------------
 .../poppler-data/poppler-data-0.4.11-r2.ebuild     | 27 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
 create mode 100644 app-text/poppler-data/poppler-data-0.4.11-r2.ebuild

(limited to 'app-text')

diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 9c070bc8218f..9ad957e67027 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,2 +1,2 @@
-DIST poppler-data-0.4.11-extra.tar.xz 3092 BLAKE2B 37d54a15a3725d4fe8c78ac2cb18cb4cc43cc65929822b6e4ac5e17c70f97dd3f4b144c34b4cb1c2439e58d379a61b6b348bc93304a1b730a6e37dd304c763ad SHA512 639dd5467cb06cb417dc1b09ca9db1f7233f902a54220899be3199a1081b91c69ff063f133080175312098ac8078ab8e2c4c91c89b460e8b92e6192f18395531
+DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
diff --git a/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
deleted file mode 100644
index c65bde103305..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-POPPLER_DATA_EXTRA_VERSION="0.4.11"
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz"
-
-# AGPL-3+ for the extra files needed by ghostscript, bug #844115
-LICENSE="AGPL-3+ BSD GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# We need to include extra cMaps for ghostscript, bug #844115
-	cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die
-
-	# bug #409361
-	dodir /usr/share/poppler/cMaps
-	cd "${ED}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
new file mode 100644
index 000000000000..3d7a975e6b0e
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POPPLER_DATA_EXTRA_VERSION="0.4.11-2"
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz"
+
+# AGPL-3+ for the extra files needed by ghostscript, bug #844115
+LICENSE="AGPL-3+ BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# We need to include extra cMaps for ghostscript, bug #844115
+	cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die
+
+	# bug #409361
+	dodir /usr/share/poppler/cMaps
+	cd "${ED}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
-- 
cgit v1.2.3-65-gdbad