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/ftjam/Manifest | 7 +++ .../files/ftjam-2.5.3-debug-commandline.patch | 14 +++++ dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch | 59 ++++++++++++++++++++++ dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch | 54 ++++++++++++++++++++ dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch | 40 +++++++++++++++ dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild | 44 ++++++++++++++++ dev-util/ftjam/metadata.xml | 7 +++ 7 files changed, 225 insertions(+) create mode 100644 dev-util/ftjam/Manifest create mode 100644 dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch create mode 100644 dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch create mode 100644 dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch create mode 100644 dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch create mode 100644 dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild create mode 100644 dev-util/ftjam/metadata.xml (limited to 'dev-util/ftjam') diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest new file mode 100644 index 000000000000..9d8ea42ca16e --- /dev/null +++ b/dev-util/ftjam/Manifest @@ -0,0 +1,7 @@ +AUX ftjam-2.5.3-debug-commandline.patch 314 BLAKE2B acc09bae7b2abd0d10ff8557b6c7f28f457b5d009c8117008c01507250afad7b22be92fc1f5f49cd9f8c30783e1d353d3b619c48366c14f011a1ba2ac51014f0 SHA512 c9e59c3785678d347510525b10824af2648f4de040bfc2d97ca2301298628d82f78c13f63b30da1baef0a8c2ed6142fa2db63650fc982601e491aaff8e15378b +AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922e27f8d36920b2da7fec6d8e58cb480aec7e328155d9ff7bef336b6efafecfd2de4459c087100ce01a6b91e39cf346a2 SHA512 b9b97127c6a5d89759563cd4a1e4f87ed911610b70bbfff309105ab733290f74087bd0eb066eaad860be5624573ad2dfc1245eb45347c2d1c9800033c35e5c0a +AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8 +AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25 +DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd +EBUILD ftjam-2.5.3_rc2-r1.ebuild 1124 BLAKE2B 818d3b4e8f887d6d390c2ee0d97d2026400dc27bff8cb6a15fbae9e442218754fae086632558bf47cd821f36048bd1ee3a557feeed51703fc26b90acb00ff86c SHA512 8c9d4eef3f1ea1b424986cdbef297ca1ce4e0f01a3d27e4fd1a18f4801dfd572673250a43d7c679ac4ebeec32d45c2097019c76ab450f3fddececc9258298e5a +MISC metadata.xml 217 BLAKE2B 55f0e28ee6fed5a28a2b01ba5367d8b0cd6e4d9fac04998f93794be3ad8a1d526d473378623b82888869bf94ddf8838c0134e733c5708e11d2b7ba0c148ab434 SHA512 84ae81764128d1c529f0228dee8311929ec35ad1bd0a8ba684febc06c8f6671b23317b2e04b0ab3670e476209ba085916afe8ada10b855510df91303aad473e5 diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch new file mode 100644 index 000000000000..ba6613430308 --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch @@ -0,0 +1,14 @@ +Make jam print the commandline it's executing. +Only useful for ebuild debugging - I just always forget how to enable it. + +--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in ++++ ftjam-2.5.3rc2/builds/unix/Makefile.in +@@ -16,7 +16,7 @@ + + all: jam0 + chmod a+w jambase.c +- ./jam0 ++ ./jam0 -dx -q + + include common.mk + diff --git a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch new file mode 100644 index 000000000000..1b33a0f770d3 --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch @@ -0,0 +1,59 @@ +Respect CC, *FLAGS. Add datarootdir for autoconf-2.60 warnings. + +--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in ++++ ftjam-2.5.3rc2/builds/unix/Makefile.in +@@ -37,6 +37,7 @@ exec_prefix := @exec_prefix@ + libdir := @libdir@ + bindir := @bindir@ + includedir := @includedir@ ++datarootdir := @datarootdir@ + datadir := @datadir@ + + version_info := @version_info@ +--- ftjam-2.5.3rc2-orig/jambase.c ++++ ftjam-2.5.3rc2/jambase.c +@@ -652,21 +652,21 @@ const char *jambase[] = { + "\n", + "AR ?= ar ru ;\n", + "AS ?= as ;\n", +-"ASFLAGS ?= ;\n", ++"ASFLAGS += $(ASFLAGS) ;\n", + "AWK ?= awk ;\n", + "BINDIR ?= /usr/local/bin ;\n", +-"C++ ?= cc ;\n", +-"C++FLAGS ?= ;\n", +-"CC ?= cc ;\n", +-"CCFLAGS ?= ;\n", ++"C++ ?= $(CXX) ;\n", ++"C++FLAGS += $(CXXFLAGS) ;\n", ++"CC ?= $(CC) ;\n", ++"CCFLAGS += $(CFLAGS) ;\n", + "CP ?= cp -f ;\n", + "CRELIB ?= ;\n", + "DOT ?= . ;\n", + "DOTDOT ?= .. ;\n", + "EXEMODE ?= 711 ;\n", + "FILEMODE ?= 644 ;\n", +-"FORTRAN ?= f77 ;\n", +-"FORTRANFLAGS ?= ;\n", ++"FORTRAN ?= $(F77) ;\n", ++"FORTRANFLAGS += $(FFLAGS) ;\n", + "HDRS ?= ;\n", + "INSTALLGRIST ?= installed ;\n", + "JAMFILE ?= Jamfile ;\n", +@@ -674,13 +674,13 @@ const char *jambase[] = { + "LEX ?= ;\n", + "LIBDIR ?= /usr/local/lib ;\n", + "LINK ?= $(CC) ;\n", +-"LINKFLAGS ?= ;\n", ++"LINKFLAGS += $(LDFLAGS) ;\n", + "LINKLIBS ?= ;\n", + "LN ?= ln ;\n", + "MANDIR ?= /usr/local/man ;\n", + "MKDIR ?= mkdir ;\n", + "MV ?= mv -f ;\n", +-"OPTIM ?= ;\n", ++"OPTIM = ;\n", + "RCP ?= rcp ;\n", + "RM ?= rm -f ;\n", + "RMDIR ?= $(RM) ;\n", diff --git a/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch new file mode 100644 index 000000000000..44322d64c2cf --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch @@ -0,0 +1,54 @@ +diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase +--- ftjam-2.5.3rc2-orig/Jambase 2007-06-05 08:20:19.000000000 -0600 ++++ ftjam-2.5.3rc2/Jambase 2008-07-21 19:26:02.000000000 -0600 +@@ -813,7 +813,7 @@ else if $(UNIX) + LINKLIBS ?= ; + OPTIM ?= -O ; + RANLIB ?= ranlib ; +- YACC ?= yacc ; ++ YACC ?= bison -y ; + YACCGEN ?= .c ; + YACCFILES ?= y.tab ; + YACCFLAGS ?= -d ; +@@ -882,10 +882,10 @@ DC ?= dmd ; + SUFLIB ?= .a ; + SUFOBJ ?= .o ; + UNDEFFLAG ?= "-u _" ; +- YACC ?= ; +- YACCGEN ?= ; +- YACCFILES ?= ; +- YACCFLAGS ?= ; ++ YACC ?= bison -y ; ++ YACCGEN ?= .c ; ++ YACCFILES ?= y.tab ; ++ YACCFLAGS ?= -d ; + + HDRPATTERN = + "^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ; +diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c +--- ftjam-2.5.3rc2-orig/jambase.c 2007-06-05 08:31:08.000000000 -0600 ++++ ftjam-2.5.3rc2/jambase.c 2008-07-21 19:27:55.000000000 -0600 +@@ -632,7 +632,7 @@ const char *jambase[] = { + "LINKLIBS ?= ;\n", + "OPTIM ?= -O ;\n", + "RANLIB ?= ranlib ;\n", +-"YACC ?= yacc ;\n", ++"YACC ?= bison -y ;\n", + "YACCGEN ?= .c ;\n", + "YACCFILES ?= y.tab ;\n", + "YACCFLAGS ?= -d ;\n", +@@ -695,10 +695,10 @@ const char *jambase[] = { + "SUFLIB ?= .a ;\n", + "SUFOBJ ?= .o ;\n", + "UNDEFFLAG ?= \"-u _\" ;\n", +-"YACC ?= ;\n", +-"YACCGEN ?= ;\n", +-"YACCFILES ?= ;\n", +-"YACCFLAGS ?= ;\n", ++"YACC ?= bison -y ;\n", ++"YACCGEN ?= .c ;\n", ++"YACCFILES ?= y.tab ;\n", ++"YACCFLAGS ?= -d ;\n", + "\n", + "HDRPATTERN =\n", + "\"^[ ]*#[ ]*include[ ]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n", diff --git a/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch b/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch new file mode 100644 index 000000000000..1b7e69fc2c8f --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch @@ -0,0 +1,40 @@ +diff -Naur ftjam-2.5.3rc2-orig/Jamfile ftjam-2.5.3rc2/Jamfile +--- ftjam-2.5.3rc2-orig/Jamfile 2007-06-05 08:30:52.000000000 -0600 ++++ ftjam-2.5.3rc2/Jamfile 2007-06-10 12:55:03.000000000 -0600 +@@ -138,16 +138,6 @@ + LinkLibraries jam : libjam.a ; + GenFile jambase.c : mkjambase Jambase ; + +-if $(UNIX) && ! $(DEBUG) +-{ +- actions Strip +- { +- strip $(1) +- } +- +- Strip jam ; +-} +- + Library libjam.a : + builtins.c command.c compile.c $(code) expand.c + glob.c hash.c headers.c lists.c make.c make1.c +@@ -156,19 +146,6 @@ + hdrmacro.c rope.c + ; + +-# Strip the Jam executable on Mingw +-# +-if $(JAM_TOOLSET) = MINGW +-{ +- actions Strip +- { +- strip $(1) +- } +- +- Strip jam$(SUFEXE) ; +-} +- +- + if $(BINDIR) { InstallBin $(BINDIR) : jam ; } + + # diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild new file mode 100644 index 000000000000..cfca2251a168 --- /dev/null +++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=0 + +inherit eutils toolchain-funcs versionator + +MY_PV=$(delete_version_separator _) + +DESCRIPTION="FTJam is a 100% compatible, enhanced implementation of the make alternative Jam" +HOMEPAGE="http://freetype.sourceforge.net/jam/index.html" +SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2" + +LICENSE="perforce GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="" + +DEPEND="!dev-util/jam + sys-devel/bison" +RDEPEND="!dev-util/jam" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.5.3-nostrip.patch + epatch "${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch + epatch "${FILESDIR}"/${PN}-2.5.3-false-flags.patch +# epatch "${FILESDIR}"/${PN}-2.5.3-debug-commandline.patch # development only +} + +src_compile() { + tc-export CC + econf + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc README README.ORG CHANGES INSTALL RELNOTES + dohtml Jam.html Jambase.html Jamfile.html +} diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml new file mode 100644 index 000000000000..7a1075ebf9ba --- /dev/null +++ b/dev-util/ftjam/metadata.xml @@ -0,0 +1,7 @@ + + + + + freetype + + -- cgit v1.2.3