summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/kbuild/Manifest1
-rw-r--r--dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch11
-rw-r--r--dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch12
-rw-r--r--dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch16
-rw-r--r--dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch10
-rw-r--r--dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch13
-rw-r--r--dev-util/kbuild/files/kbuild-glibc-2.10.patch33
-rw-r--r--dev-util/kbuild/files/kbuild-unknown-configure-opt.patch12
-rw-r--r--dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild64
-rw-r--r--dev-util/kbuild/metadata.xml13
-rw-r--r--sys-fs/libeatmydata/Manifest3
-rw-r--r--sys-fs/libeatmydata/libeatmydata-82.ebuild34
-rw-r--r--sys-fs/libeatmydata/libeatmydata-82.ebuild.orig30
13 files changed, 250 insertions, 2 deletions
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
new file mode 100644
index 00000000..47c80a29
--- /dev/null
+++ b/dev-util/kbuild/Manifest
@@ -0,0 +1 @@
+DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
new file mode 100644
index 00000000..4f165397
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
@@ -0,0 +1,11 @@
+--- Config.kmk
++++ Config.kmk
+@@ -147,7 +147,7 @@
+ MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/
+ endif
+ ifndef MY_INST_DOC
+- MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/
++ MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/
+ endif
+ if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE)
+ MY_INST_BIN_MODE := $(MY_INST_MODE),a+x
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
new file mode 100644
index 00000000..435b3f57
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
+--- kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c 2011-08-17 14:28:42.000000000 -0700
++++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c 2012-06-16 13:55:05.341176965 -0700
+@@ -781,7 +781,7 @@
+ }
+
+ static unsigned char
+-internal_function __attribute ((pure))
++internal_function
+ re_string_fetch_byte_case (re_string_t *pstr)
+ {
+ if (BE (!pstr->mbs_allocated, 1))
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
new file mode 100644
index 00000000..8ad2ab32
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
@@ -0,0 +1,16 @@
+ src/kmk/Makefile.kmk | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
+index fe2cd43..135431e 100644
+--- a/src/kmk/Makefile.kmk
++++ b/src/kmk/Makefile.kmk
+@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
+ TEMPLATE_BIN-KMK_INCS.freebsd = glob
+ TEMPLATE_BIN-KMK_INCS.openbsd = glob
+ TEMPLATE_BIN-KMK_INCS.solaris = glob
+-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
++TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
+ ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
new file mode 100644
index 00000000..d2b20176
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
@@ -0,0 +1,10 @@
+--- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
++++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
+@@ -59,6 +59,7 @@
+ if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win"
+ kash_CFLAGS += -std=gnu99
+ endif
++kash_LIBS += pthread
+ kash_CFLAGS.win.amd64 = -GS-
+ kash_SOURCES = \
+ main.c \
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
new file mode 100644
index 00000000..9b0df420
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
@@ -0,0 +1,13 @@
+--- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
++++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
+@@ -35,6 +35,10 @@
+ # include <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+
+ const char *myname;
diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
new file mode 100644
index 00000000..a1d17d7d
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
@@ -0,0 +1,33 @@
+diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c
+--- kBuild-0.1.5-orig/src/ash/output.c 2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.c 2009-05-22 20:11:49.000000000 -0400
+@@ -230,6 +230,7 @@
+ va_end(ap);
+ }
+
++#if 0
+ void
+ dprintf(const char *fmt, ...)
+ {
+@@ -240,6 +241,7 @@
+ va_end(ap);
+ flushout(out2);
+ }
++#endif
+
+ void
+ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
+diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h
+--- kBuild-0.1.5-orig/src/ash/output.h 2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.h 2009-05-22 20:12:28.000000000 -0400
+@@ -65,8 +65,10 @@
+ __attribute__((__format__(__printf__,2,3)));
+ void out1fmt(const char *, ...)
+ __attribute__((__format__(__printf__,1,2)));
++#if 0
+ void dprintf(const char *, ...)
+ __attribute__((__format__(__printf__,1,2)));
++#endif
+ void fmtstr(char *, size_t, const char *, ...)
+ __attribute__((__format__(__printf__,3,4)));
+ void doformat(struct output *, const char *, va_list);
diff --git a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
new file mode 100644
index 00000000..c9a8994e
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
@@ -0,0 +1,12 @@
+diff -urN ./kBuild-0.1.5.orig/bootstrap.gmk ./kBuild-0.1.5/bootstrap.gmk
+--- ./bootstrap.gmk 2009-01-10 03:24:02.000000000 +0100
++++ ./bootstrap.gmk 2009-03-11 10:39:25.679010950 +0100
+@@ -179,7 +179,7 @@
+ echo done > $@
+
+ $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
+- cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
++ cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
+ echo done > $@
+
+ $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
new file mode 100644
index 00000000..556195a6
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild,v 1.1 2013/11/30 17:51:39 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils autotools toolchain-funcs
+
+MY_P=kBuild-${PV/_/-}-src
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/flex
+ sys-devel/gettext
+ virtual/yacc"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+pkg_setup() {
+ # https://bugs.gentoo.org/501394
+ # src/sed/config/mdate-sh parses `ls` output
+ export TIME_STYLE=posix-locale
+}
+
+src_prepare() {
+ rm -rf "${S}/kBuild/bin"
+
+ epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
+ "${FILESDIR}/${PN}-glibc-2.10.patch" \
+ "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" \
+ "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" \
+ "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" \
+ "${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch" \
+ "${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
+
+ cd "${S}/src/kmk" || die
+ eautoreconf
+ cd "${S}/src/sed" || die
+ # AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
+ sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+ eautoreconf
+
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+ -i "${S}"/Config.kmk || die #332225
+ tc-export CC RANLIB #AR does not work here
+}
+
+src_compile() {
+ kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+ || die "bootstrap failed"
+}
+
+src_install() {
+ kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+ || die "install failed"
+}
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
new file mode 100644
index 00000000..365af956
--- /dev/null
+++ b/dev-util/kbuild/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>swapon@gmail.com</email>
+ <name>Alessio Cassibba</name>
+ </maintainer>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 5ec1ccae..936d4f3b 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,3 +1,2 @@
DIST libeatmydata-65.tar.gz 408813 SHA256 8a16c1ff04aeceed1891e2772728359d3368347e1807bed60fc6147d8968d5c1 SHA512 b2e3ed9c67b6ae9b0e5918b114bf0fb6e59dda3bff9b9331a8c280243822d4c77f35e9b08138ea65a74c893cc2bd67677bbf28b03bc61f011b24dd39d171adc2 WHIRLPOOL 51347727497073130ab4ea18d963a8d98c3e950a56c612f0485f205908b1b97f10f6e0afdad2a3d1c448bde2132426fc0a173a6140009a26a3a8db581b13460e
-EBUILD libeatmydata-65.ebuild 846 SHA256 9427d14c35adb1e41e1350fb82d524ee64c836c3c4e4331d9da1755187adc299 SHA512 8bd4a10aea39861973b1f0dc7e56ba4c6f4e4952d9802f0d8245c90a7a34d0c0cf49da55ec7992585ae7ae9cfa610fb68e7306e1990cf82402dcdc93a1dd0f97 WHIRLPOOL bf64eb1f2d04c831645a4f2fd391505c96390bbd03e8f6589552b1c983b24fb75f145cf0c4ba7eab4f7d3a7776f482932e59941e1533c5bac6b72c081cdeedb2
-MISC metadata.xml 418 SHA256 0c6bc6c9ea92b82db94551664b91213845a8e7b6a156d661a6078079aae4eb64 SHA512 a47a87f4e76d5f4891400a3e88500985fe65fd84991e060809dc55c8e5d7d67f0bf1bea84b85c4d9f5720c25a206b49fc05aa8872b13dfc97714785b377df97e WHIRLPOOL 42ce5ee8789ec4a4e9d832e3aacb1bfdf08c59b1b90753885905e4785ae69fc2fcf8332a6d125c6631f7fcc0c005fbd28e5b0d7f14fe1f62e73a882b4616bad4
+DIST libeatmydata-82.tar.gz 407977 SHA256 0b675f58069f912727cee5eb75f9ff1a6a8300fe7e3fe4fc6bdd03b7c2c15b29 SHA512 882b2464c26d99ea0b01a2f1171dddb637ac0b3509c18416da4e0199f515ff23c43a7bb5eb641bc3447a2c6be06c261260713565c3e4c4b988995d09f52d623c WHIRLPOOL 5f6decc9e2a8de05379bd16874b2fb8865b52b115686c11cb0d0126b2ace822e0722cf0e2a7810e9f573fb1845dac00db991ecdbef10e98f49a1a5e4a7705153
diff --git a/sys-fs/libeatmydata/libeatmydata-82.ebuild b/sys-fs/libeatmydata/libeatmydata-82.ebuild
new file mode 100644
index 00000000..d7e8466a
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-82.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/libeatmydata-82.ebuild,v 1.1 2013/07/18 14:15:51 slyfox Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://launchpad.net/libeatmydata/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+# sandbox fools LD_PRELOAD and libeatmydata does not get control
+# bug/feature in sandbox?
+#DEPEND="test? ( dev-util/strace )"
+RESTRICT=test
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_prepare() {
+ multilib_copy_sources
+}
+
+src_install() {
+ multilib-minimal_src_install
+
+ prune_libtool_files --all
+ dodoc AUTHORS README
+}
diff --git a/sys-fs/libeatmydata/libeatmydata-82.ebuild.orig b/sys-fs/libeatmydata/libeatmydata-82.ebuild.orig
new file mode 100644
index 00000000..def77b49
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-82.ebuild.orig
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/libeatmydata-82.ebuild,v 1.1 2013/07/18 14:15:51 slyfox Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://launchpad.net/libeatmydata/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+# sandbox fools LD_PRELOAD and libeatmydata does not get control
+# bug/feature in sandbox?
+#DEPEND="test? ( dev-util/strace )"
+RESTRICT=test
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_install() {
+ default
+
+ prune_libtool_files --all
+ dodoc AUTHORS README
+}