app-text/xpdf-3.04: Fix SRC_URI and prefixed installation.

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 37e5f44416fa13b0ba144e51eeb7b21cbecaa095..53ef6f3e5aa608c20673e557bb58200f7624673d 100644 (file)
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,4 @@
-AUX xpdf-Add-Gentoo-font-path.patch 914 SHA256 291265ef0699050ca02329bfec5dab884cf12668f3d050744575ae9429fcdb16 SHA512 8aa45a2ae21fd92dc71c1a5a5e8afec1a91933889ed17f18da6d2b248df27a6651e599e43674cd9fdc16282f8fa197b46ea010588a5a55df068ba51b47d37166 WHIRLPOOL 4308c3a5330d75aa44dbe56c7ceb39a94abf6ff0ebfe359d3feaa5f2df92a6088056bd070aaeac9235744aa70ac5716f8985f19f621b7654a2a839a5ba67823c
-AUX xpdf.desktop 2892 SHA256 3f3fc98969317d5082a91af51df69df8a6b5d172cda7aa73f4ee91ac7643b0f0 SHA512 320d34f0a5f73da571140fe450f5bd2d473def70781920b702714933aaab8d4d735cc3ea252b2b13355b639158eecd9a7ec48d4de53946f1675fc2230b012f4d WHIRLPOOL 94bd33dc06056c87b6bc32a8ddfb4a76983a6a147172c331d3a30a440e5b6c54e9200498bdce7e3f4fa030a69782081f8843335043c67ba80ebaacb4824178f3
-DIST xpdf-3.04.tar.gz 825519 SHA256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5 SHA512 3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf WHIRLPOOL 0787d42de82f7907a4f7a0e35aa7d95366db003628857da01ed12b3c7008ce88cdfb2dd6a08155b9a6b9bfd1b70c8aedf67b0b1fd41a77f17253576b1d3aac4a
-EBUILD xpdf-3.04-r1.ebuild 991 SHA256 d2b47b8d4e4acb9fc7ab17f3fda701ca332740eeba23f8a5bd4c944dc6bbdd34 SHA512 ded78a79b99defe9227a0d1d6d311604cbcf23a99bc9e0adbb7a857832c7c61b519f7a4193115c660f9024581a9be18781f17945e0f9c41511e7ebfe94f02e3a WHIRLPOOL 5cea48555efea3d1e900f1565cffe29053dec9bf88e6bc4bb190010728bfee0eedad216642dfbca00079e3b583be4a548ae05607d833f273295e9f358011b7a2
+AUX xpdf-Add-Gentoo-font-path.patch 1981 BLAKE2B 05652a65e0b8c128f229517586a823cd4d96e0984286af7337849b3d5d3e73167b884f8864f24a1bd3206004838234cfa6cb25a0d9cb20ae2bb6630804f43167 SHA512 8d3c91954f141ebe67b340448b557412089e558d99df5c24afb7758756d8ad24c9a4655ce8ea68f5271b4becb14af3c461a6ec596bd7f52056ab0f3f14cf7e19
+AUX xpdf.desktop 2892 BLAKE2B bfd17519f46f9686612ad3d4c1890aad8cafa373013ca12b585e17054f2b5ab2b6b6c7f3da744ae4cf0493e098a7b393e9467a4dda063b9ee16897d836fcbfe3 SHA512 320d34f0a5f73da571140fe450f5bd2d473def70781920b702714933aaab8d4d735cc3ea252b2b13355b639158eecd9a7ec48d4de53946f1675fc2230b012f4d
+DIST xpdf-3.04.tar.gz 825519 BLAKE2B 69e6f75e64b9b76f08a1b5e2d738042b1b263bf2222245bf051eb137f104d022ccbe58902626173b6a14c54aeef843bfcb93bed07f717df49462ab92f94194a2 SHA512 3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf
+EBUILD xpdf-3.04-r2.ebuild 1069 BLAKE2B c34998de54dc6a83ebbf010a5d4153db37bb437d84b08651763d1dc7e73eaa2c4d8916fa14a9cfadab88eb676b856f31feb9debcf41f1824207ec4bf05a96917 SHA512 bac15d35561c3bf93d5ccdd51518706e6363ee8f031bbb9af1097169c6609ea3ce453578f91e0c06630a4664b0500e7582475b663263993737c6a5e920b7f1ed

diff --git a/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch b/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
index 2a7f834c828f2c99b6b3cc1b4a231480a13d8b7e..22a76b6d9e2307e4471a3db19393ecb0b9f5e599 100644 (file)
--- a/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
+++ b/app-text/xpdf/files/xpdf-Add-Gentoo-font-path.patch
@@ -1,27 +1,52 @@
-From 0ce58e3f3c78760aa1f2204325862113a71ef763 Mon Sep 17 00:00:00 2001
+From abd57e6f4300dd10e13930076f7d11ca3f08c2cd Mon Sep 17 00:00:00 2001
 From: Nick Bowler <nbowler@draconx.ca>
-Date: Sat, 28 Jan 2012 16:01:01 -0500
-Subject: [PATCH] Add Gentoo font path to default search dir.
+Subject: [PATCH] Add Gentoo font paths to default search dir.
 
 This allows Xpdf to automatically find the required type-1 fonts on
-Gentoo.  The font paths can also be set in xpdfrc, but this approach is
-more robust as the user's xpdfrc overrides the system-wide one.
+Gentoo.  The font paths can also be set in xpdfrc, but this approach
+is more robust as the user's xpdfrc overrides the system-wide one.
+
+The newly added paths respect datarootdir to better support prefixed
+installations.
 ---
- xpdf/GlobalParams.cc |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ xpdf/GlobalParams.cc | 2 ++
+ xpdf/Makefile.in     | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/xpdf/GlobalParams.cc b/xpdf/GlobalParams.cc
-index 63e932b..7b7dc41 100644
+index ea7e9fd9d142..19e04114adb4 100644
 --- a/xpdf/GlobalParams.cc
 +++ b/xpdf/GlobalParams.cc
-@@ -110,6 +110,7 @@ static const char *displayFontDirs[] = {
+@@ -120,6 +120,8 @@ static const char *displayFontDirs[] = {
  };
  #else
  static const char *displayFontDirs[] = {
-+  "/usr/share/fonts/urw-fonts",
++  DATAROOTDIR "/fonts/urw-fonts",
++  DATAROOTDIR "/fonts/Type1",
    "/usr/share/ghostscript/fonts",
    "/usr/local/share/ghostscript/fonts",
    "/usr/share/fonts/default/Type1",
+diff --git a/xpdf/Makefile.in b/xpdf/Makefile.in
+index de3e6766e60a..d7118b7053a1 100644
+--- a/xpdf/Makefile.in
++++ b/xpdf/Makefile.in
+@@ -9,6 +9,7 @@
+ SHELL = /bin/sh
+ 
+ prefix = @prefix@
++datarootdir = @datarootdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+@@ -19,7 +20,7 @@ FOFILIBDIR = ../fofi
+ SPLASHSRCDIR = $(srcdir)/../splash
+ SPLASHLIBDIR = ../splash
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @libpng_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ @EXTRA_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -DDATAROOTDIR=\"$(datarootdir)\" -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @libpng_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ @EXTRA_CFLAGS@
+ 
+ LDFLAGS = @LDFLAGS@
+ 
 -- 
-1.7.3.4
+2.24.1
 

diff --git a/app-text/xpdf/xpdf-3.04-r1.ebuild b/app-text/xpdf/xpdf-3.04-r2.ebuild
similarity index 62%
rename from app-text/xpdf/xpdf-3.04-r1.ebuild
rename to app-text/xpdf/xpdf-3.04-r2.ebuild
index bb248211dd2f6adc777b2949b6a9041159681430..29fe8f36a211fec84b43c1bf06f65614d1047475 100644 (file)
--- a/app-text/xpdf/xpdf-3.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-3.04-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright © 2012, 2014-2015 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
+# Copyright © 2012, 2014-2015, 2020 Nick Bowler
+# License GPLv3+: GNU General Public License version 3 or any later version.
+# This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit desktop xdg
 
 DESCRIPTION="An X viewer for PDF files"
 HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz"
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/old/$P.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
@@ -22,13 +23,10 @@ DEPEND=">=x11-libs/motif-2.3:0
 RDEPEND="$DEPEND
        media-fonts/urw-fonts"
 
-src_prepare() {
-       epatch "$FILESDIR/xpdf-Add-Gentoo-font-path.patch"
-       epatch_user
-}
+PATCHES=("$FILESDIR/xpdf-Add-Gentoo-font-path.patch")
 
 src_configure() {
-       econf --with-freetype2-includes=/usr/include/freetype2
+       econf --with-freetype2-includes=${EROOT%/}/usr/include/freetype2
 }
 
 src_install() {