From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-libs/libfstrcmp/Manifest | 3 + .../libfstrcmp/files/libfstrcmp-0.7-docdir.patch | 140 +++++++++++++++++++++ .../libfstrcmp/files/libfstrcmp-0.7-libtool.patch | 81 ++++++++++++ dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild | 49 ++++++++ 4 files changed, 273 insertions(+) create mode 100644 dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch create mode 100644 dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch create mode 100644 dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild (limited to 'dev-libs/libfstrcmp') diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest index 3c72122fad26..996f680dcabb 100644 --- a/dev-libs/libfstrcmp/Manifest +++ b/dev-libs/libfstrcmp/Manifest @@ -1,4 +1,7 @@ +AUX libfstrcmp-0.7-docdir.patch 4491 BLAKE2B 31bfda4805b99de8e590861ff5445bbc88424e1e19b3f70bfac8c86474383ee8cb90bc42daa8a5da05868880336b197f130a4925c7f524224da3ffdf0fe6b680 SHA512 b45621d8cafe0f5f0f70f12e2b2e35399d5e471c724cc4957ee019da40fd6e01bc4b9b2367349fbfb61deec7f1b128c5fd8fce2a2288271295813ad6d0a6641f +AUX libfstrcmp-0.7-libtool.patch 1905 BLAKE2B d74c235e4bbfc7a5e3e055beecdda3cd0b215adb537fead2b76bd0ed070cc4f24d4d2d27839ba7cb13dd79004d1ecfd61db5d4202b6ef2d81102c1f970dd356b SHA512 36f3a43dca917fbca4b43236b02033c627c1e36221ab98f0bfc7f85cf926c5634fe05410d87649cf30541bcb014b8c40f18c6f040a74a6e1bb8af21ecde49860 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c EBUILD libfstrcmp-0.7-r1.ebuild 936 BLAKE2B aec038edb10757e1e674b8bf6cce2cc455651d6d4c44fcb9144b766f3e515ff7a8be4e00f2fad33db2b5832b2ad36d924d25c70f51766a4dfe10d3acdd325242 SHA512 93a6953dfd66031ff561a0693aece3c1a2a518e9f2d9f4f4d4e77fcf4e922eb87708a31a9dcbb9f625c138d3247aa1ef80d9ad2d38eb71e68fadb49af592657b +EBUILD libfstrcmp-0.7-r3.ebuild 1042 BLAKE2B db0746e6cd7a4be0e2acdb5700ba4b223f542620b7c1024c270c8bdbea17ef01a35057ab1f2935c805f6693c5e981a6ef2e4ca01c2031aa2d8d8e94c6bad25e1 SHA512 23a876364cc03743592e90b766246348b4be9a78d1e3e8508c0330e15d12fee95da1c3af4bbed5a3b2e16e287d2268c084532a757b8d54472476173611a7f407 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683 MISC metadata.xml 326 BLAKE2B 926108a5954c15305765e37bb63c177e30757266bdc7267d0693f8d9412cca3bc0f1eab55463fe5198980e5adafe191e36fec7bf0dbde4fc72d203d0666b3608 SHA512 abd7abb1a7b5d420e540dae2eea944bad4b16334c40e677277b9a610cf342781e9a38613218ec215a5c3c3abe14c1f83b24185c6061f70d20a28b1c3af6dd395 diff --git a/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch new file mode 100644 index 000000000000..197c6220c575 --- /dev/null +++ b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch @@ -0,0 +1,140 @@ +https://bugs.gentoo.org/853133 + +From: orbea +Date: Mon, 20 Jun 2022 07:49:14 -0700 +Subject: [PATCH] build: Support docdir + +--- a/Makefile.in ++++ b/Makefile.in +@@ -31,6 +31,14 @@ + # Use "./configure --help" for a list of options. + # + ++# ++# the name of the package ++# ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++ + # + # directory containing the source + # +@@ -86,6 +94,16 @@ exec_prefix = @exec_prefix@ + # + bindir = $(DESTDIR)@bindir@ + ++# ++# Where to put the documentation. ++# ++# On a network, this would be shared between all machines on the network. It can ++# be read-only. ++# ++# The $(DESTDIR) is for packaging. ++# ++docdir = $(DESTDIR)@docdir@ ++ + # + # Where to put the manuals. + # +@@ -97,7 +115,7 @@ bindir = $(DESTDIR)@bindir@ + mandir = $(DESTDIR)@mandir@ + + # define this to silence ./configure warning +-datarootdir = $(DESTDIR)@datarootdir@ ++datarootdir = @datarootdir@ + + # + # Where to put the supplementary package executables. +@@ -164,7 +182,7 @@ etc/building.pdf: etc/building.man man/man1/z_copyright.so + ps2pdf etc/building.ps $@ + rm etc/building.ps + +-$(datarootdir)/doc/fstrcmp/building.pdf: .mkdir.__datarootdir__doc_fstrcmp \ ++$(docdir)/building.pdf: .mkdir.__datarootdir__doc_fstrcmp \ + etc/building.pdf + $(INSTALL_DATA) etc/building.pdf $@ + +@@ -175,7 +193,7 @@ etc/readme.pdf: etc/new.0.1.so etc/new.0.2.so etc/new.0.3.so etc/new.0.4.so \ + ps2pdf etc/readme.ps $@ + rm etc/readme.ps + +-$(datarootdir)/doc/fstrcmp/readme.pdf: .mkdir.__datarootdir__doc_fstrcmp \ ++$(docdir)/readme.pdf: .mkdir.__datarootdir__doc_fstrcmp \ + etc/readme.pdf + $(INSTALL_DATA) etc/readme.pdf $@ + +@@ -191,7 +209,7 @@ etc/reference.pdf: etc/building.man etc/new.0.1.so etc/new.0.2.so \ + ps2pdf etc/reference.ps $@ + rm etc/reference.ps + +-$(datarootdir)/doc/fstrcmp/reference.pdf: .mkdir.__datarootdir__doc_fstrcmp \ ++$(docdir)/reference.pdf: .mkdir.__datarootdir__doc_fstrcmp \ + etc/reference.pdf + $(INSTALL_DATA) etc/reference.pdf $@ + +@@ -532,14 +550,9 @@ $(libdir)/libfstrcmp.la: .mkdir.__libdir_ lib/libfstrcmp.la + @-test -d $(datarootdir) && touch $@ + @sleep 1 + +-.mkdir.__datarootdir__doc: .mkdir.__datarootdir_ +- -$(INSTALL_DIR) $(datarootdir)/doc +- @-test -d $(datarootdir)/doc && touch $@ +- @sleep 1 +- +-.mkdir.__datarootdir__doc_fstrcmp: .mkdir.__datarootdir__doc +- -$(INSTALL_DIR) $(datarootdir)/doc/fstrcmp +- @-test -d $(datarootdir)/doc/fstrcmp && touch $@ ++.mkdir.__datarootdir__doc_fstrcmp: .mkdir.__datarootdir_ ++ -$(INSTALL_DIR) $(docdir) ++ @-test -d $(docdir) && touch $@ + @sleep 1 + + .mkdir.__includedir_: +@@ -633,7 +646,7 @@ clean-doc: + + clean-misc: + rm -f .bin .mkdir.__bindir_ .mkdir.__datarootdir_ +- rm -f .mkdir.__datarootdir__doc .mkdir.__datarootdir__doc_fstrcmp ++ rm -f .mkdir.__datarootdir__doc_fstrcmp + rm -f .mkdir.__includedir_ .mkdir.__libdir_ .mkdir.__libdir__pkgconfig + rm -f .mkdir.__mandir_ .mkdir.__mandir__man1 .mkdir.__mandir__man3 core + rm -f etc/building.pdf etc/readme.pdf etc/reference.pdf +@@ -666,9 +679,9 @@ install: install-bin install-doc install-include install-libdir install-man + + install-bin: $(bindir)/fstrcmp$(EXEEXT) + +-install-doc: $(datarootdir)/doc/fstrcmp/building.pdf \ +- $(datarootdir)/doc/fstrcmp/readme.pdf \ +- $(datarootdir)/doc/fstrcmp/reference.pdf ++install-doc: $(docdir)/building.pdf \ ++ $(docdir)/readme.pdf \ ++ $(docdir)/reference.pdf + + install-include: $(includedir)/fstrcmp.h + +@@ -687,9 +700,9 @@ install-man: $(mandir)/man1/fstrcmp.1 $(mandir)/man1/fstrcmp_license.1 \ + $(mandir)/man3/fwcscmp.3 $(mandir)/man3/fwcscmpi.3 + + uninstall: +- rm -f $(bindir)/fstrcmp$(EXEEXT) $(datarootdir)/doc/fstrcmp/building.pdf +- rm -f $(datarootdir)/doc/fstrcmp/readme.pdf +- rm -f $(datarootdir)/doc/fstrcmp/reference.pdf $(includedir)/fstrcmp.h ++ rm -f $(bindir)/fstrcmp$(EXEEXT) $(docdir)/building.pdf ++ rm -f $(docdir)/readme.pdf ++ rm -f $(docdir)/reference.pdf $(includedir)/fstrcmp.h + rm -f $(libdir)/libfstrcmp.a $(libdir)/libfstrcmp.la + rm -f $(libdir)/libfstrcmp.so* $(libdir)/pkgconfig/fstrcmp.pc + rm -f $(mandir)/man1/fstrcmp.1 $(mandir)/man1/fstrcmp_license.1 +--- a/configure.ac ++++ b/configure.ac +@@ -16,7 +16,7 @@ dnl! + dnl! You should have received a copy of the GNU General Public License + dnl! along with this program. If not, see . + dnl! +-AC_INIT(install-sh) ++AC_INIT([fstrcmp], [0.7]) + AC_CONFIG_HEADER(lib/config.h) + AC_PROG_CC + AC_CANONICAL_HOST diff --git a/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch new file mode 100644 index 000000000000..4d893a5b2262 --- /dev/null +++ b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch @@ -0,0 +1,81 @@ +https://bugs.gentoo.org/778371 + +From: orbea +Date: Sat, 18 Jun 2022 20:49:52 -0700 +Subject: [PATCH] configure: Use LT_INIT to find libtool + +LT_INIT will generate libtool for the build which is required by +rlibtool to determine if building shared or static libraries. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -37,6 +37,11 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# ++# directory containing the build ++# ++top_builddir = @top_builddir@ ++ + # + # the name of the install program to use + # +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ AC_PROG_CC + AC_CANONICAL_HOST + AC_GNU_SOURCE + AC_PROG_INSTALL +-AC_PROG_RANLIB ++LT_INIT + AC_CHECK_PROGS(AR, ar) + + AC_USE_SYSTEM_EXTENSIONS +@@ -32,6 +32,8 @@ AC_ISC_POSIX + AC_OBJEXT + AC_EXEEXT + ++AC_SUBST([top_builddir], [$abs_builddir]) ++ + dnl @synopsis AC_ADD_CFLAGS + dnl + dnl Add the given option to CFLAGS, if it doesn't break the compiler +@@ -53,37 +55,6 @@ AC_ADD_CFLAGS(-Wshadow) + dnl! AC_ADD_CFLAGS(-Werror) + dnl! AC_ADD_CFLAGS([-Wl,--as-needed]) + +-AC_CHECK_PROGS(LIBTOOL, libtool) +- +-if test -z "$LIBTOOL" +-then +- AC_MSG_RESULT([ +- You must have GNU Libtool installed to build fstrcmp. +- Homepage: http://www.gnu.org/software/libtool/]) +- OK=no +- if apt-get --version > /dev/null 2> /dev/null; then +- AC_MSG_RESULT([ +- The following command may be used to install it: +- sudo apt-get install libtool +- ]) +- OK=yes +- fi +- if yum --version > /dev/null 2> /dev/null; then +- AC_MSG_RESULT([ +- The following command may be used to install it: +- sudo yum install libtool +- ]) +- OK=yes +- fi +- if test "$OK" != "yes"; then +- AC_MSG_RESULT([ +- If you are using a package based install, you will need the +- libtool package. +- ]) +- fi +- exit 1 +-fi +- + AC_CHECK_PROGS(GROFF, groff roff) + AC_CHECK_PROGS(SOELIM, gsoelim soelim) + AC_CHECK_PROGS(REFER, refer grefer) diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild new file mode 100644 index 000000000000..1f812c5f4edd --- /dev/null +++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Make fuzzy comparisons of strings and byte arrays" +HOMEPAGE="http://fstrcmp.sourceforge.net/" +SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-${PV}.D001.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/fstrcmp-${PV}.D001" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="doc static-libs test" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +BDEPEND=" + sys-apps/groff + doc? ( app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${P}-libtool.patch # 778371 + "${FILESDIR}"/${P}-docdir.patch # 853133 +) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake all-bin + use doc && emake all-doc +} + +src_install() { + emake DESTDIR="${D}" install-bin install-include install-libdir install-man + find "${D}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${D}" -name '*.a' -delete || die + fi + use doc && emake DESTDIR="${D}" install-doc + einstalldocs +} -- cgit v1.2.3