From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-util/fhist/Manifest | 9 ++++++ dev-util/fhist/fhist-1.16.ebuild | 45 +++++++++++++++++++++++++++ dev-util/fhist/fhist-1.19.ebuild | 29 +++++++++++++++++ dev-util/fhist/fhist-1.21.ebuild | 29 +++++++++++++++++ dev-util/fhist/files/1.19-ldflags.patch | 43 +++++++++++++++++++++++++ dev-util/fhist/files/fhist-1.21-ldflags.patch | 40 ++++++++++++++++++++++++ dev-util/fhist/metadata.xml | 11 +++++++ 7 files changed, 206 insertions(+) create mode 100644 dev-util/fhist/Manifest create mode 100644 dev-util/fhist/fhist-1.16.ebuild create mode 100644 dev-util/fhist/fhist-1.19.ebuild create mode 100644 dev-util/fhist/fhist-1.21.ebuild create mode 100644 dev-util/fhist/files/1.19-ldflags.patch create mode 100644 dev-util/fhist/files/fhist-1.21-ldflags.patch create mode 100644 dev-util/fhist/metadata.xml (limited to 'dev-util/fhist') diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest new file mode 100644 index 000000000000..b4d0bf059348 --- /dev/null +++ b/dev-util/fhist/Manifest @@ -0,0 +1,9 @@ +AUX 1.19-ldflags.patch 1742 BLAKE2B aacfbf6f8a3f4f0016e6b2736940c8bc4f6b461222c7942c8dbe5b50eac150cef7a4551a1408fe04a5667e20b7570c26739eeacd52fd1c8cf60d17a1c36bae19 SHA512 350ba6f6b2d1c12b23401e0dc21162f41cafc64d2278cc9b188e7b8680e395677218013c398e84c14f0bf1a8ff2c69729d426d5892c88214eeb7b0c8016ddda9 +AUX fhist-1.21-ldflags.patch 1594 BLAKE2B b98857e3564238cb366728625760e9c43cdb2d0f0824b11c9fe1d3bf2ce396b42cd0cdd4446765aee62288a83fe1353b006e05a342b25f23a952e6c80290a306 SHA512 ddd894daf5e8a86a6d9cde1b29d2a0a61fae8bcf11a86dd16b4e2099eb094489ce20a5849eeb771ef712267da6eb7323d08c9e2e432c39a90d8b3bc310569e5d +DIST fhist-1.16.tar.gz 383180 BLAKE2B d80c0d72733344498fc3082ca0906b50d4de78b1a6656c2a3b72758fa5e509fd20b40ef6f25c570a93b00db58f563d2c3fd08be40e33096d6e6491e436a13219 SHA512 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d +DIST fhist-1.19.tar.gz 409083 BLAKE2B 15efaf7441dbdd39bfa21dc74cef912b10cf82c24e4484c44c8469f68570025563b6303dfb003341835124df7b7cb71ff84628f6440f69ab531c53172914af25 SHA512 d93f0ce1b29e527af5de3f49d44ebc11567f53bb0b428322daa42b0a4a14ae75333ffcb9a65ba14b2a6240d57be7bdf7632e6b4eccd071d4e9b6e90c14c317a9 +DIST fhist-1.21.D001.tar.gz 409961 BLAKE2B 275406a8f49d70b41fe1595d907e8a5a3aad8c1802933fec06e7839e22e770975bdcdcc1e743a9c554b1060bf0c4ebd3c23d4efd240fca32ce10096a690b6ba1 SHA512 9f69ba29bdd44b4888decdcfb7db49a29a1c9611ae5cd733af2e3ec04afc498674854616335d13ca732a6485cbffafc6a4072d14a9638ead1dea4412a2070f97 +EBUILD fhist-1.16.ebuild 840 BLAKE2B 119eb14ad08fc9113a3b2943b5002052ae0a1d8c2c9181692bff4ede0833fdc7c1bde8c7086876a1bd7f0108c78cbe5ebbfa60b32ef46667961665c4bb213735 SHA512 78a462dd4bee4aa8c996a0919d328c0674d37c0201d06b60dc5b2724793400153a8d5129e0715e5b946284a30823013631531cf98099edb6f626871c6e76a27b +EBUILD fhist-1.19.ebuild 623 BLAKE2B 032ad2a7a4f9d5b68bfbd30a369efc5d15526115856dbb6552e3621ead19873b905158f0612c6c1cdb2bb52659997dff208125690db683ae5d62f698a1b986b1 SHA512 28df7e012eb27594d9c26f9cc7a1a2bd36887481db45cd8f0edbc8a5fd6bd56c0606bc7d605322f89f859ee2e4c638c1bfc776b310816d0205c784cc40bde33e +EBUILD fhist-1.21.ebuild 627 BLAKE2B 5a399048373061e484d6f0736dee1daeb2bb9419e0ecd2c42e9170a328cb9bad6eb7fdefca4d53a88542d1c9abc83afad608ba5fa10836edd787344ae62d6091 SHA512 d1a8ea57a1613f6ea85995deda14da7f5cdd632b552c9d1f20f39285de7e27542b23a5274f8770ddadeaa4aee632dd0ac0797218a7cafe48e684a0535a4cb2b8 +MISC metadata.xml 340 BLAKE2B dcc8a7d3c5b31bddb3b821e922b972f7fb1eb93657f9b6c75114be911fa4a25bf41234403f4525a28d0fad7206e7b7d677751d4310fcd08b33bf93a15fad2819 SHA512 ac21cc184e87106ab2436015b123151f0a647f020492718cde669d0252d94995c937f4e6b393cc90d60ad48fbe7f35451803a18e84717c860946e13a2a7afc35 diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild new file mode 100644 index 000000000000..28569ab13662 --- /dev/null +++ b/dev-util/fhist/fhist-1.16.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=0 + +DESCRIPTION="File history and comparison tools" +HOMEPAGE="http://fhist.sourceforge.net/fhist.html" +SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~ppc x86" +IUSE="test" + +RDEPEND="sys-devel/gettext + sys-apps/groff" +DEPEND="${RDEPEND} + test? ( app-arch/sharutils ) + sys-devel/bison" + +MAKEOPTS+=" -j1" + +src_compile() { + econf + emake || die "emake failed" +} + +src_test() { + emake sure || die "src_test failed" +} + +src_install () { + emake \ + RPM_BUILD_ROOT="${D}" \ + NLSDIR="${D}/usr/share/locale" \ + install || die "make install failed" + + dodoc lib/en/*.txt || die + dodoc lib/en/*.ps || die + + # remove duplicate docs etc. + rm -r "${D}"/usr/share/fhist + + dodoc MANIFEST README || die +} diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild new file mode 100644 index 000000000000..c23d28e436b5 --- /dev/null +++ b/dev-util/fhist/fhist-1.19.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils flag-o-matic + +DESCRIPTION="File history and comparison tools" +HOMEPAGE="http://fhist.sourceforge.net/fhist.html" +SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-libs/libexplain + sys-devel/gettext + sys-apps/groff" +DEPEND="${RDEPEND} + sys-devel/bison + test? ( app-arch/sharutils )" + +src_prepare() { + MAKEOPTS+=" -j1" + epatch "${FILESDIR}"/${PV}-ldflags.patch + append-cflags -fgnu89-inline +} diff --git a/dev-util/fhist/fhist-1.21.ebuild b/dev-util/fhist/fhist-1.21.ebuild new file mode 100644 index 000000000000..1f783dcb8d3a --- /dev/null +++ b/dev-util/fhist/fhist-1.21.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils flag-o-matic + +DESCRIPTION="File history and comparison tools" +HOMEPAGE="http://fhist.sourceforge.net/fhist.html" +SRC_URI="http://fhist.sourceforge.net/${P}.D001.tar.gz" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-libs/libexplain + sys-devel/gettext + sys-apps/groff" +DEPEND="${RDEPEND} + sys-devel/bison + test? ( app-arch/sharutils )" + +src_prepare() { + MAKEOPTS+=" -j1" + epatch "${FILESDIR}"/${P}-ldflags.patch + append-cflags -fgnu89-inline +} diff --git a/dev-util/fhist/files/1.19-ldflags.patch b/dev-util/fhist/files/1.19-ldflags.patch new file mode 100644 index 000000000000..c0fa0e825a9e --- /dev/null +++ b/dev-util/fhist/files/1.19-ldflags.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile.in b/Makefile.in +index 8aa8408..2c39b28 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -500,8 +500,9 @@ common/sub/expr.$(OBJEXT): common/sub/expr.c common/ac/stdarg.h \ + $(CC) $(CPPFLAGS) $(CFLAGS) -I. -c common/sub/expr.c + mv expr.$(OBJEXT) common/sub/expr.$(OBJEXT) + +-common/sub/expr_gram.yacc.c common/sub/expr_gram.yacc.h: \ +- common/sub/expr_gram.y ++common/sub/expr_gram.yacc.c: common/sub/expr_gram.yacc.h ++ ++common/sub/expr_gram.yacc.h: common/sub/expr_gram.y + $(YACC) -d common/sub/expr_gram.y + sed -e 's/[yY][yY]/sub_expr_gram_/g' y.tab.c > \ + common/sub/expr_gram.yacc.c +@@ -961,7 +962,7 @@ common/libcommon.a: $(lib_obj) + fcomp_obj = fcomp/main.$(OBJEXT) + + bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) \ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) \ + common/libcommon.a $(LIBS) + + $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir +@@ -974,7 +975,7 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) \ + fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT) + + bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) \ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) \ + common/libcommon.a $(LIBS) + + $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir +@@ -983,7 +984,7 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir + fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT) + + bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) \ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) \ + common/libcommon.a $(LIBS) + + $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir diff --git a/dev-util/fhist/files/fhist-1.21-ldflags.patch b/dev-util/fhist/files/fhist-1.21-ldflags.patch new file mode 100644 index 000000000000..00aab69d7495 --- /dev/null +++ b/dev-util/fhist/files/fhist-1.21-ldflags.patch @@ -0,0 +1,40 @@ + Makefile.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index ba4e4c2..c0e552a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -916,8 +916,8 @@ common/libcommon.a: $(common_obj) + fcomp_obj = fcomp/main.$(OBJEXT) + + bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \ +- $(LDFLAGS) $(LIBS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \ ++ $(LIBS) + + $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir + $(INSTALL_PROGRAM) bin/fcomp$(EXEEXT) $@ +@@ -928,8 +928,8 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) fhist/extract.$(OBJEXT) + fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT) + + bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) common/libcommon.a \ +- $(LDFLAGS) $(LIBS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) common/libcommon.a \ ++ $(LIBS) + + $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir + $(INSTALL_PROGRAM) bin/fhist$(EXEEXT) $@ +@@ -937,8 +937,8 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir + fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT) + + bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \ +- $(LDFLAGS) $(LIBS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \ ++ $(LIBS) + + $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir + $(INSTALL_PROGRAM) bin/fmerge$(EXEEXT) $@ diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml new file mode 100644 index 000000000000..71ffe3a34b29 --- /dev/null +++ b/dev-util/fhist/metadata.xml @@ -0,0 +1,11 @@ + + + + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + + fhist + + -- cgit v1.2.3