gentoo resync : 28.11.2020

5 files changed, 53 insertions, 48 deletions

diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index b3fb2df7dcca..7599178a5ae2 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1,6 +1,7 @@
 AUX u2ps-1.1-nostrip.patch 579 BLAKE2B 0b76323c430eb56730dc15540424d12ddc509b0dbb4dab2a58a2bdd92d24952d95527faa62d39d295c3eb90f90403ce9fbdac6ee0791c61b021dea8dc4e97ab5 SHA512 8b45c626f439c7f72be092a310dd105bd1348185ed4c2bea05b084360b4b5f01cbd7cc6a2b1b3b9e8510bc1f1cc4feca429b0347bbc7a9c40694cb78af4391ac
+AUX u2ps-1.2-respect-ldflags.patch 337 BLAKE2B bfb1dcfeffe9bef0fa201fa71679e5c63a114c4fbcdecae249da5fb13d8600fc4acc101e6a32a9caab806dc2bfc4b14e73ca14fda478f12f5cd929c24ba51ca3 SHA512 e967f92c06a30a490604efaedc681d4156acc8dee8ace9e73bdc75b693f8a74dfe1ddfa6261c5c0f1dc3e9661868c7085518dd65cddd2ff6c93e4a2f98fb14c3
 DIST u2ps-1.1.tar.gz 110892 BLAKE2B af0dd92d47a8530e8434983132c3bf0f0e6b88ff14cc9d7e73e95c842b4c1dad1b900d91c22a34c8f94373e62382841329e5b2e6b3aa9b51f6e5d6d6d164b596 SHA512 44a470268aafe7b90c17e14a15864924d0ba78b0c8707b9bf076e13b262a9d43d71b6527c5a995f82741e52fe2d07eac6a2626921e7465127a57405d4b5babd3
-DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
-EBUILD u2ps-0.8.4.ebuild 871 BLAKE2B ee76a71dbfe790942e74257ec4bba30340b4576892424c032b3b02370b83b2f77dd4f0d6552e7b38d5271bb3ef530e9a1064716f82f8de767afe185dad67dc2b SHA512 eacaf727800f1b06376980ce822a5c059633645b41609254a8134d4deabe6f82acb1027733f056515c12a8d80c8761ae5668ba6e627f761e28c56a6050255b45
-EBUILD u2ps-1.1.ebuild 684 BLAKE2B 1d0fc4e2589e66744b61242c549ef6d650fbcb8e5ddd6c7733b0b3ec4dfd18442b7c56ae8464ba825d05996bb07ba5fcd34614a06844e47cef26126ace7685a6 SHA512 f56ebd5ef238898e355e105d7498e1f78034501a6a2ecfa4adab3b45d399ddaef8a1bdd71d814f9b75119c293b8425a816a9268aad29045aa1ecbfd1acfba1ee
+DIST u2ps-1.2.tar.gz 110917 BLAKE2B 223aec319d36191032e45a73d9053a970ef76c780c9260e3d6a3799c24f80eb0bddd645de87806570844c3e4e763a2eb1929d44bf122daeaebcefd711d61d35d SHA512 3c5c12b50b6d2d50c67a1051375aeb4cfb32a2c8c898837313ac7ff4a11f30c4625f71f77203f7b1367b1ccdb9143a1106b99deaef8f964af3d08336ce686198
+EBUILD u2ps-1.1.ebuild 683 BLAKE2B 03ac72e425c30bb34bfdb9b790b16a697545f51f5d152203f9eb64bb05237e3ec0acaf4e18a1b4935ce8d2fa0020ce185c9ac8b9828710453ed1080b345ed512 SHA512 65d1d3dad868a2bbb3c3dba3fdf5f9037b3a301157f943ba087e8a0733e8447def370f04fdb866231c1b77d4308a8e06551f8bdbc3a2eab2ce88ebe75a7faea4
+EBUILD u2ps-1.2.ebuild 816 BLAKE2B d0a0aa4587135beb17b032c2c6b83881e4f38f9e7eb8d4c819057e26f367a4b08fbdf891b97bbc1ccbd779425b2da09bd23ef39f6c18f571ad051b4cfb4891ef SHA512 e69458dc9c28511127052b3514bf29a192be743ad3415c96b9464fb7ea860d0b8e79af1b0a8cd18d16844bc55c1e0c721a6fba21a2a64cf3a955c83894b71b8e
 MISC metadata.xml 249 BLAKE2B c8d28416ba97bac363e00b75508b255979d89984b4b053fb86e63deb2070dc32a4a363e5594e4fcf4a4c33268fd59e5e4d3c962087c7cd97e2912a6d62f0cefe SHA512 23e993b72c46792c1d03d216adc82fe8392b7b695187308ad3c5b181da2dbd9d1f68b884c60429e3bcae79693112369ef84a02545aeda90460aa2504b4057d5a
diff --git a/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
new file mode 100644
index 000000000000..a9d4ac5e1ebf
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 8a526f0..88b90b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ u2ps: u2ps.o u2ps_opts.o u2ps_data.o u2ps_file.o u2ps_page.o u2ps_pswr.o \
+ ttf2pt42: ttf2pt42.o warn.o
+ 
+ %: %.o
+-	$(CC) -o $@ $(filter %.o,$^)
++	$(CC) -o $@ $(filter %.o,$^) ${LDFLAGS}
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
deleted file mode 100644
index 62fbac22b42b..000000000000
--- a/app-text/u2ps/u2ps-0.8.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
-HOMEPAGE="https://sourceforge.net/projects/u2ps.berlios/"
-SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
-
-LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/perl-5.6
-	dev-perl/Text-CharWidth
-	app-text/ghostscript-gpl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-full-${PV}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--with-perl=/usr/bin/perl \
-		--with-gs=/usr/bin/gs \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake
-	emake man
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc README DESIGN
-	doman man/u2ps.1
-}
diff --git a/app-text/u2ps/u2ps-1.1.ebuild b/app-text/u2ps/u2ps-1.1.ebuild
index c28a8ccdd0aa..e8d7cb002289 100644
--- a/app-text/u2ps/u2ps-1.1.ebuild
+++ b/app-text/u2ps/u2ps-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="app-text/ghostscript-gpl"
diff --git a/app-text/u2ps/u2ps-1.2.ebuild b/app-text/u2ps/u2ps-1.2.ebuild
new file mode 100644
index 000000000000..b26e759a2a62
--- /dev/null
+++ b/app-text/u2ps/u2ps-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://github.com/arsv/u2ps"
+SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.2-respect-ldflags.patch"
+)
+
+src_configure() {
+	# this isnt autoconf, so econf fails...
+	tc-export CC
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--with-gs="${EPREFIX}"/usr/bin/gs \
+		|| die 'configure failed'
+}