commit: 395bfd358c5499dcf401ebaa00f9073d40d49c41 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Dec 31 12:23:44 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Dec 31 12:44:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395bfd35
dev-libs/pslib: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../pslib/files/pslib-0.4.5-fix-build-system.patch | 22 ++++++++++++++++++++++ dev-libs/pslib/pslib-0.4.5.ebuild | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) 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 new file mode 100644 index 00000000000..242a819d0da --- /dev/null +++ b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch @@ -0,0 +1,22 @@ +--- a/configure.in ++++ b/configure.in +@@ -4,7 +4,7 @@ + AC_CONFIG_SRCDIR(src/pslib.c) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + AM_MAINTAINER_MODE + + AC_PROG_INTLTOOL +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -36,7 +36,7 @@ + ps_fontenc.c \ + ps_strbuf.c + +-libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) ++libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm + + BUILD_LIBS = -lm + diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild index f3a704c4f43..b81fc2baa5c 100644 --- a/dev-libs/pslib/pslib-0.4.5.ebuild +++ b/dev-libs/pslib/pslib-0.4.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="pslib is a C-library to create PostScript files on the fly" HOMEPAGE="http://pslib.sourceforge.net/"; @@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="debug jpeg png static-libs tiff" RDEPEND=" - png? ( >=media-libs/libpng-1.2.43-r2:0 ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff )" + png? ( media-libs/libpng:0= ) + jpeg? ( virtual/jpeg:0 ) + tiff? ( media-libs/tiff:0= )" #gif? requires libungif, not in portage DEPEND="${RDEPEND} dev-lang/perl @@ -25,10 +25,11 @@ DEPEND="${RDEPEND} dev-util/intltool dev-perl/XML-Parser" +PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch ) + src_prepare() { - # hackpatchfix underlinking - sed -i -e 's/$(TIFF_LIBS)/$(TIFF_LIBS) -lm/' src/Makefile.am || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die + default + mv configure.{in,ac} || die eautoreconf } @@ -45,5 +46,6 @@ src_configure() { src_install() { default - prune_libtool_files --all + # package installs .pc files + find "${D}" -name '*.la' -delete || die }
