gentoo resync : 13.10.2017

6 files changed, 137 insertions, 2 deletions

diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index 014544edf24c..8fec884ce9ed 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -1,7 +1,12 @@
 AUX pps-tools-0.0.20120407-build.patch 1268 SHA256 825557e79c640edcf92e35986e51c74b609f549b08d9fd4b22c56e262c5ecb23 SHA512 942f1a94e4f0811a82e7b15905c84050e9990266690bb26f4145ecd5c29a9804dd5917158f925cf0df3908f3d2eee67c7df6daef32e745cec574f9169c6f0818 WHIRLPOOL 5e2d560e7477be1fa63a22ccf463907725f37c5b156e31064a18c21fe38ad7b949def508731ec6408acd4f5ebec9c608443facee4c54c62270ecc1589d9a75d8
 AUX pps-tools-0.0.20120407-install.patch 740 SHA256 95e567de9cc958dcd8b926d91bb35ae5989685593dfd288a973101edb990a8aa SHA512 0f08cd8018ec279751d297c0392bb685488e44aea0b03f754e7f81cc020a5d8872b4aad362c59eebe857a3ea0127827a66567f70f269fcbd0961fb4fe284dce2 WHIRLPOOL be1264b5d2f43f33b1537606526c06a7d1993e361ac38bc9ac7f0e3794b8bd5e3a87b873428411c3924b46731f02f515cbf662a1c73e05272403880651d168b4
+AUX pps-tools-1.0.1-LDFLAGS-fix.patch 537 SHA256 27749e4fc55ab2a77351cede5fdb667a39a83c678d142de53ca7fdbc1d717442 SHA512 1e5f301f7f7d40196db7341ed99160deab2efd9f38eb23683ca549241169cba441c4c893f793f26b55ff727274b1d44f2fdd65c870373b23e3e6f781cf150875 WHIRLPOOL b9bab3f2d392567989923984e61ec202817bdaf796eecd06f097f2bedb18407a96b175d364eece1048415a7877e824b797cc442c838b1d87cc9f4870b1631d83
+AUX pps-tools-1.0.1-build.patch 1220 SHA256 4e767abfad6cfb10f4852b32e7d21e85f433c0bb89fbbd34247d996024c4530f SHA512 d2f845e21baf0643dcdf222dc39790eb3e60ca112d6ce2de1a9b8b12f6d1dde6645a72a91df2cacb26fb10154e8f9b99917570a854e1a4fdae0f10271fa1ba0b WHIRLPOOL 5c806b7518551132246da138964871e9872835a3fee28d59293ec575ce3e804c5fa02cdf4b47e760408d08dbba3c5394b6f114e8c357982f7a4f54a5632ea4bb
+AUX pps-tools-1.0.1-install.patch 693 SHA256 898dc2e35b140f7956dcd5b8e1837ed041017305b90b6613c62fb1acb13c939f SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc WHIRLPOOL b91f2fd5b7fdefd18acd0a5cf7e9403d5ce7c2cc4fcba612d7202b24d85f6af03e353a8ad87b8ade7bcfd8fba699abe34add6f3958e3eb90d3013a82d6b37e66
+DIST pps-tools-1.0.1.tar.gz 12695 SHA256 4bd138d0459f73bc9016dfa72e8c0940797934d47f56f771f740a026592e67cc SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784 WHIRLPOOL cec0e6a80c83186b85f13f50a7a144d63ae51e173e29902220d31c00ab7072387d0bdda846ea2738e4a7697b6e83ec69f82c2e5af92532f9ff9677f7d54c9ac2
 DIST pps-tools-git-0.0.20120407.tar.gz 13619 SHA256 eb020d40a3938546620889bb6ecdeead2c188e87ffd43c3ae04a41e5998e7997 SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de WHIRLPOOL 03ff250da63ff2ca2f9111b8207608e0e989c376a5af51b919d4fb8889936e00db2b15d14309dda68e92e13c7478f81e5a2d72544eefa73eb93287dd0396fc14
 EBUILD pps-tools-0.0.20120407.ebuild 662 SHA256 a3af0baf7feb85ed8f700d2fe598901df81bb5db55b27038f3a1753b832b99ab SHA512 0e13fdd0be326f43b216075377e29bd1c9cf99ba940733e04a0b52f575820f19144e5480b9e4702196657b21a8befe9ed437f43bce4ecea1f96353267c7433a4 WHIRLPOOL 8b929c4b5e195aa18ec03c38d7247cbe8b412d2b37d31be645fa08c62322a083f13039acf04e7cd76671db4c089cf91a6e41a882a6e711c161c5bb64a0559605
+EBUILD pps-tools-1.0.1.ebuild 585 SHA256 7d692c5ad089bef32e924a1f279fa805d17588645c51c6cc080f41a05b5fcb04 SHA512 53da81c0c2a677108998500a3cb7cdb4bb7715b7146daaf65a7f55ab2997ac4f9d877cacbd3a215e8f4506d877f3a478c132d22676c7ffc9953a94fde0725721 WHIRLPOOL 59e75311f1190abae0d6c90ac633fc7e856ea646723d52e42cf60b51907f72d91310ba46577231225b052ea823c2bc9d77de25669c77178079d42a130599e67d
 MISC ChangeLog 3418 SHA256 4524cb154ade79fdeea9223c9a86edaf25f4a8b2b3e726be3c77c9051957732a SHA512 9cdf52965e2fa0943dabbc69e298df089b9d88a46ef0ea101d511ce16b7880e646fa83f659debcbe4de72902f0c4da9627a8f6dc85172eea0676ed82dc3d8cf7 WHIRLPOOL 5b62242024470b157e55a233a2b22b053d94b8b1e2d6e6fe430b5fd4452ccf4f53e391b24990ef76d27ee5095571188732731bcd408e126f3661134145519dd0
 MISC ChangeLog-2015 1273 SHA256 1690d73a6fc856daa756ef6edd964d0c05e50000287c353e4528c73b39cccdaf SHA512 df57b5b31c187d47531afea58db95659705d227f9d0605478050e919c5446304693bcc9069bb5195ef0461210e547d9758508905036a5c106768703cf64179e8 WHIRLPOOL 9133660f5baa5b40c9bcab0cecfd790ce78ae9efbbb1155aa970091abb8d5e660ed8ed5144c74ebcacd84d323cbc627af673f2be1d0088f2fe57cdb45a3503f0
-MISC metadata.xml 345 SHA256 6420fa692cd0acfc0c009ea153ef2d05dff469420f95ebb1ecd8c40751c2adfc SHA512 cd79fd584727403db3f11615834967c49fd5bfb191ef1eb347ac6908db75f34358d0a8480e749bfc7c0ab7e0a4dc4afc7ccdac65c624c249ed95faf40a06878b WHIRLPOOL 1d2a202c7eebdd3ac95bf261e2eb303e24ac90e52b05e0cfc43960bb1e19166ab9c238752fb9faebb1c3b0dae42669b56312de64d687a7a7a85dca3ebfa15e67
+MISC metadata.xml 350 SHA256 1f60e43bba2e21a97d188a9925e3c517addb59fae3991a06156edb1cf6497172 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06 WHIRLPOOL 0656a24b80e00ea67acaeea238b4a7bb6f4366f0d7d4d562c9c564eb6cd2f0cf85090309638b71aeaa59d19aede0983064e3da04f7fd73b853897ce815739170
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch
new file mode 100644
index 000000000000..868d97138184
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch
@@ -0,0 +1,25 @@
+From 231123e1b275f88000e336a2d80d3d96c470ac5e Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Fri, 13 Oct 2017 15:10:08 +0200
+Subject: [PATCH] We need LDLIBS instead of LDFLAGS
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 039795e..a6bff4b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ CFLAGS ?= -O2 -ggdb
+ CFLAGS += -Wall
+ CFLAGS += -fPIC
+ CPPFLAGS += -D_GNU_SOURCE
+-LDFLAGS += -lm
++LDLIBS += -lm
+ 
+ # -- Actions section --
+ 
+-- 
+2.14.2
+
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch
new file mode 100644
index 000000000000..adc127205afc
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch
@@ -0,0 +1,51 @@
+From 60a8a9d3195829cc0c2953fd02bdf0a155e0c158 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 18 Aug 2012 17:04:43 -0400
+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 c70f073..ec437e2 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
+ LDFLAGS += -lm
+ 
+ # -- Actions section --
+@@ -12,11 +13,9 @@ LDFLAGS += -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.14.2
+
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-install.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-install.patch
new file mode 100644
index 000000000000..8aee2ff459fc
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-1.0.1-install.patch
@@ -0,0 +1,27 @@
+From a530d8853aa6b6ec46236f6ae787cbd37c94e9ba Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 18 Aug 2012 17:15:19 -0400
+Subject: [PATCH] fix DESTDIR installs
+
+Make sure the dirs we install into exist first:
+        make install DESTDIR=$PWD/foo
+
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index ec437e2..039795e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,6 +18,7 @@ all : .depend $(TARGETS)
+ -include .depend
+ 
+ install : all
++	mkdir -p -m 755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/include/sys
+ 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
+ 	install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
+ 
+-- 
+2.14.2
+
diff --git a/net-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
index 53886946600b..53492db4389e 100644
--- a/net-misc/pps-tools/metadata.xml
+++ b/net-misc/pps-tools/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Base System</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ago/pps-tools</remote-id>
+    <remote-id type="github">redlab-i/pps-tools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/pps-tools/pps-tools-1.0.1.ebuild b/net-misc/pps-tools/pps-tools-1.0.1.ebuild
new file mode 100644
index 000000000000..67919d79f146
--- /dev/null
+++ b/net-misc/pps-tools/pps-tools-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-build.patch
+	"${FILESDIR}"/${PN}-1.0.1-install.patch
+	"${FILESDIR}"/${PN}-1.0.1-LDFLAGS-fix.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+}