| 1 |
commit: 395bfd358c5499dcf401ebaa00f9073d40d49c41 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 31 12:23:44 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 31 12:44:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395bfd35 |
| 7 |
|
| 8 |
dev-libs/pslib: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../pslib/files/pslib-0.4.5-fix-build-system.patch | 22 ++++++++++++++++++++++ |
| 13 |
dev-libs/pslib/pslib-0.4.5.ebuild | 22 ++++++++++++---------- |
| 14 |
2 files changed, 34 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..242a819d0da |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch |
| 21 |
@@ -0,0 +1,22 @@ |
| 22 |
+--- a/configure.in |
| 23 |
++++ b/configure.in |
| 24 |
+@@ -4,7 +4,7 @@ |
| 25 |
+ AC_CONFIG_SRCDIR(src/pslib.c) |
| 26 |
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) |
| 27 |
+ |
| 28 |
+-AM_CONFIG_HEADER(config.h) |
| 29 |
++AC_CONFIG_HEADERS([config.h]) |
| 30 |
+ AM_MAINTAINER_MODE |
| 31 |
+ |
| 32 |
+ AC_PROG_INTLTOOL |
| 33 |
+--- a/src/Makefile.am |
| 34 |
++++ b/src/Makefile.am |
| 35 |
+@@ -36,7 +36,7 @@ |
| 36 |
+ ps_fontenc.c \ |
| 37 |
+ ps_strbuf.c |
| 38 |
+ |
| 39 |
+-libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) |
| 40 |
++libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm |
| 41 |
+ |
| 42 |
+ BUILD_LIBS = -lm |
| 43 |
+ |
| 44 |
|
| 45 |
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild |
| 46 |
index f3a704c4f43..b81fc2baa5c 100644 |
| 47 |
--- a/dev-libs/pslib/pslib-0.4.5.ebuild |
| 48 |
+++ b/dev-libs/pslib/pslib-0.4.5.ebuild |
| 49 |
@@ -1,9 +1,9 @@ |
| 50 |
-# Copyright 1999-2014 Gentoo Foundation |
| 51 |
+# Copyright 1999-2017 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
-EAPI=4 |
| 55 |
+EAPI=6 |
| 56 |
|
| 57 |
-inherit eutils autotools |
| 58 |
+inherit autotools |
| 59 |
|
| 60 |
DESCRIPTION="pslib is a C-library to create PostScript files on the fly" |
| 61 |
HOMEPAGE="http://pslib.sourceforge.net/" |
| 62 |
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 63 |
IUSE="debug jpeg png static-libs tiff" |
| 64 |
|
| 65 |
RDEPEND=" |
| 66 |
- png? ( >=media-libs/libpng-1.2.43-r2:0 ) |
| 67 |
- jpeg? ( virtual/jpeg ) |
| 68 |
- tiff? ( media-libs/tiff )" |
| 69 |
+ png? ( media-libs/libpng:0= ) |
| 70 |
+ jpeg? ( virtual/jpeg:0 ) |
| 71 |
+ tiff? ( media-libs/tiff:0= )" |
| 72 |
#gif? requires libungif, not in portage |
| 73 |
DEPEND="${RDEPEND} |
| 74 |
dev-lang/perl |
| 75 |
@@ -25,10 +25,11 @@ DEPEND="${RDEPEND} |
| 76 |
dev-util/intltool |
| 77 |
dev-perl/XML-Parser" |
| 78 |
|
| 79 |
+PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch ) |
| 80 |
+ |
| 81 |
src_prepare() { |
| 82 |
- # hackpatchfix underlinking |
| 83 |
- sed -i -e 's/$(TIFF_LIBS)/$(TIFF_LIBS) -lm/' src/Makefile.am || die |
| 84 |
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die |
| 85 |
+ default |
| 86 |
+ mv configure.{in,ac} || die |
| 87 |
eautoreconf |
| 88 |
} |
| 89 |
|
| 90 |
@@ -45,5 +46,6 @@ src_configure() { |
| 91 |
src_install() { |
| 92 |
default |
| 93 |
|
| 94 |
- prune_libtool_files --all |
| 95 |
+ # package installs .pc files |
| 96 |
+ find "${D}" -name '*.la' -delete || die |
| 97 |
} |
Archives