gentoo resync : 15.02.2018

3 files changed, 78 insertions, 0 deletions

diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index c9586034b8e1..44621e2bba94 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -3,8 +3,11 @@ AUX pps-tools-0.0.20120407-install.patch 740 BLAKE2B 3da7acd1c21d49f1628752e7b9a
 AUX pps-tools-1.0.1-LDFLAGS-fix.patch 537 BLAKE2B 9fbabfc6465043d86494d7e4bb4ae2e6281c7484188aff25e46f7ad6f3c7eb36b82fac4ae35b03a6a099792d71d562e91f94db708458d40e4f349e44a10c6f29 SHA512 1e5f301f7f7d40196db7341ed99160deab2efd9f38eb23683ca549241169cba441c4c893f793f26b55ff727274b1d44f2fdd65c870373b23e3e6f781cf150875
 AUX pps-tools-1.0.1-build.patch 1220 BLAKE2B 0f5f1cb76a57753a34913b308ebdc50bc399ad2a71958c9fa72520a3968243d518fc5aadce101033bfb6634c39ab1bce11c1a2202c59f9245353797685b3fdfc SHA512 d2f845e21baf0643dcdf222dc39790eb3e60ca112d6ce2de1a9b8b12f6d1dde6645a72a91df2cacb26fb10154e8f9b99917570a854e1a4fdae0f10271fa1ba0b
 AUX pps-tools-1.0.1-install.patch 693 BLAKE2B 6f85d636697c30abee4a5c3c83d8c0a636c1e70343a373ab483bb98a7d5d4db60373ad0337f2feadf0f64585bf180211df8cfc17f1e465023884477bdac3a8f4 SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc
+AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a573d4e69bec67283aac1c19ab86939478b2ce6a205671d9282cfd17f7f0731653374d1fb7971bbead75c6ac6a23e4 SHA512 3494d05eca69fb3b3011ce79a4b8cbaab5eb2ec89abb2b1ffabbd1d677585b4054bae398c4703048be0e32c4cdbd9c188fb624571b688630d95b03396e5e759c
 DIST pps-tools-1.0.1.tar.gz 12695 BLAKE2B 8c05f037b03efc2685bf303f521e168e6c56c203665482fa456278e3580fba8d2fc04935b7f32b70b6ac50c28d4f998a2808f5e3034dcffad4ff1589fd8f2907 SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784
+DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
 EBUILD pps-tools-0.0.20120407.ebuild 669 BLAKE2B ef45b85c29268b43ddbf80a2d143dc4d98b2d2b02907e0c3353013328e2f1f9ad416ea47e35cb02e3238c928ea913201d7810b4e60342edc20cb93b837c04ee1 SHA512 4a3424922816c0592f1cce1af2293588fb49cb630aff0ad68c3b76fa700207ab8762c6cb38555d1b99adab3c050d2ef8b15b09fb8b7a02c0b0fcc1150d6c2695
 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a
+EBUILD pps-tools-1.0.2.ebuild 546 BLAKE2B 2ec9fcf152f44414fd77be561266608cee51d1af08471b5bf2271199d2d747ea8441d2b42e86ea40db40ff0c6b9297686f8d9c03ddf7670865bedf32807836fd SHA512 f08f8363ac12f14b6e7cb25cc9285a4940a7c0fda147d48cd2ec11fa46d61559af0b5a198471f0209d8074fa7cc92bd32f90c12769516dcf27eb06b2ad1dfcca
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
new file mode 100644
index 000000000000..a62a6bb561cf
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
@@ -0,0 +1,50 @@
+From 5deb13d9d980a595946ff58e4e6d83f9d770ff10 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 14 Feb 2018 09:35:34 +0100
+Subject: [PATCH] fix up makefile
+
+Make sure we respect CFLAGS/CPPFLAGS properly.
+
+Also fix up the depend include so we get reproducible behavior --
+the depend file is generated & included first, and we don't get
+weird behavior when we run:
+        git clean -x -d
+        make
+        make
+---
+ Makefile | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9394668..af3ae56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
+ TARGETS = ppstest ppsctl ppswatch ppsldisc
+ 
+-CFLAGS += -Wall -O2 -D_GNU_SOURCE
+-CFLAGS += -ggdb
++CFLAGS ?= -O2 -ggdb
++CFLAGS += -Wall
+ CFLAGS += -fPIC
++CPPFLAGS += -D_GNU_SOURCE
+ LDLIBS += -lm
+ 
+ # -- Actions section --
+@@ -12,11 +13,9 @@ LDLIBS += -lm
+ all : .depend $(TARGETS)
+ 
+ .depend depend dep :
+-	$(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -M $(TARGETS:=.c) > .depend
+ 
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++-include .depend
+ 
+ install : all
+ 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
+-- 
+2.16.1
+
diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
new file mode 100644
index 000000000000..7291f8a36e61
--- /dev/null
+++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-space tools for LinuxPPS"
+HOMEPAGE="https://github.com/redlab-i/pps-tools"
+SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-build.patch
+	"${FILESDIR}"/${PN}-1.0.1-install.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}