gentoo resync : 18.08.2019

7 files changed, 237 insertions, 64 deletions

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index b7ec2e94d5ba..3edde641b7b3 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,12 +1,15 @@
 AUX Makefile.Darwin.in 2074 BLAKE2B a1aeb0fb86fb24f1027c9ad9424b7004dff4c9f43c3e18fb4c5eab6938efa09d8ba9a25951073afe0446f342356cee31ca1345cc45a91f2f1764dd8496723707 SHA512 cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22
 AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0af792f53b00af1ff227c8a1cbaba42595620250ff7c16ce3eb9f21489966b128615f532633cd66c92983657b3c0d712ee6ff SHA512 560aaf84c59c90b6c19f8cd8290e54bcbe7e1e5dad226b8c332be7a67789f68d29d19bd6110ffa907c587d80dc370f68fb4db88442015723a526cb77079441d6
 AUX liblockfile-1.13-makefile.patch 2368 BLAKE2B aa269b2ecc5aac3ef62fb716f4311f7a15089d46402cae106f5f24cadbd6320926140b0d20d36849a71dad62ed337a09aa20ac28eda009f6f3bd96f32b99711c SHA512 65c73a6717d466f60bee814920be455496ea958db86d0004c30a4bed1d5554a0b7e9917d8380dda097c38b2b91b2cdac08095cde2c48dbba85bd4a1920e980a0
+AUX liblockfile-1.15-makefile.patch 2655 BLAKE2B 16f079f138b98d927e6d421b5445210d8187a204eadd9ffacafa2923d55eb2e0f8d4406795ae1460d853d28a223322663eeb5933736af3b0c422db023fa24c4f SHA512 3e468cb22758910dc992c501321282f8bbfe533037fe2009928d537011662d8347ca28f53d8b8cd92040bfc90b481affb7edfdf06c7c8d1a3e2b2892f7d024db
+AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
+DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc SHA512 509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
+DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0
 EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
-EBUILD liblockfile-1.13.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
 EBUILD liblockfile-1.14-r1.ebuild 1130 BLAKE2B 14451dec7293976ed3ccd58fbe675f6efc5f05bfae8d211c28b656c544d288c6f09cf40abbc0fbf1234784c24d85f78c589b7ecec4b5b4d0e620b2a57e014fcd SHA512 76f42e4476266e4b9d3d9e3717ac6299fc247bec1892121d515581ba9e476a2b3ae8cc669ea2bc412c02bb6e74d9f96e906628c667c6ccab3ab503e4a083fefc
-EBUILD liblockfile-1.14.ebuild 1117 BLAKE2B e9b3beca84c51bbdaacd84d8d793fa7cfa37b1fdc3e019f5a607006e146fb3dfd33ea66c14d0bce9803fedaa93fc564093a7d71173e6ae60bda3f9b43cbad08c SHA512 eedaf954bf3c317ac9e5daf3b66ffa07e52e0bcd96377154d88e46f0ecd6d653d7cb2449571e25aed490042b3b7658b00113cdd57432cf8ebbdeb674f79c4fc0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD liblockfile-1.15.ebuild 1165 BLAKE2B bef201605ed043612397ee0c2a5f8bbbc91cb70c945b6690a92b0897596c2df066f2f8eca6e5f9452fa4f78596abfdf69b5257fd8966b5b26f7670ec41aff7b3 SHA512 ed07cccd8be76c9677dc6083a31511aa17c52f8fb02629fc6b7ec962c0e202e55ea669a16cc538eead4564511e63d4c3eec34fa3403142fdb310c4367c30edd3
+EBUILD liblockfile-1.16.ebuild 1365 BLAKE2B eb781781e516595e90681c7b248dd6c9b6cbf1552a963c62a848ab826d8ca96856fe3d4271f9e9b07566264d0b6eed2e7189c4d7d53b8476fa24f8fc8c4ca80d SHA512 215232d3116f0ea65d44ba08e3f44fa284e8831b8e1e9592e09cea910efebb9fc022c84832f7a0f73dba5b7f8a0342a6ec27af04e162e7292190dd076965c40e
+MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
new file mode 100644
index 000000000000..952a5703b5d4
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
@@ -0,0 +1,74 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,8 +9,9 @@ NFSVER		= 0.1
+ CFLAGS		= @CFLAGS@ -I.
+ LDFLAGS		= @LDFLAGS@
+ CC		= @CC@
++AR		= @AR@
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+ libdir		= @libdir@
+@@ -22,7 +23,7 @@ MAILGROUP	= @MAILGROUP@
+ 
+ VERSION		= $(shell sed -ne "1s/^liblockfile (\(.*\))/\1/p" < Changelog)
+ 
+-all:		@TARGETS@ test
++all:		@TARGETS@
+ install:	@INSTALL_TARGETS@
+ 
+ static:		liblockfile.a dotlockfile
+@@ -51,34 +52,34 @@ xlockfile.o:	lockfile.c
+ 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+ 
+ install_static:	static install_common
+-		install -d -m 755 -g root -p $(libdir)
+-		install -m 644 liblockfile.a $(libdir)
++		install -d -m 755 -p $(DESTDIR)$(libdir)
++		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
+ 
+ install_shared:	shared install_static install_common
+-		install -d -m 755 -g root -p $(libdir)
++		install -d -m 755 -p $(DESTDIR)$(libdir)
+ 		install -m 755 liblockfile.so \
+-			$(libdir)/liblockfile.so.$(SOVER)
+-		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
+-		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
++			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
++		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
++		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
+ 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
+-		install -d -m 755 -g root -p $(includedir)
+-		install -d -m 755 -g root -p $(bindir)
+-		install -d -m 755 -g root -p $(mandir)/man1
+-		install -d -m 755 -g root -p $(mandir)/man3
+-		install -m 644 lockfile.h maillock.h $(includedir)
++		install -d -m 755 -p $(DESTDIR)$(includedir)
++		install -d -m 755 -p $(DESTDIR)$(bindir)
++		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
++		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
++		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
+ 		if [ "$(MAILGROUP)" != "" ]; then\
+-		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
++		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
+ 		else \
+-		  install -g root -m 755 dotlockfile $(bindir); \
++		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
+ 		fi
+-		install -m 644 *.1 $(mandir)/man1
+-		install -m 644 *.3 $(mandir)/man3
++		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
++		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
+ 
+ install_nfslib:	nfslib
+-		install -d -m 755 -g root -p $(nfslockdir)
+-		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
++		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
++		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
+ 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ 
+ test:		test-stamp
diff --git a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
new file mode 100644
index 000000000000..1994680be775
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
@@ -0,0 +1,80 @@
+From 31cb6368b7feabfba37388050523667acd8942ac Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Tue, 13 Aug 2019 12:19:35 +0200
+Subject: [PATCH] Makefile.in: Export AR; Don't use DESTDIR in prefix
+ definition.
+
+---
+ Makefile.in | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2721b48..798c603 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,8 +9,9 @@ NFSVER		= 0.1
+ CFLAGS		= @CFLAGS@ -I.
+ LDFLAGS		= @LDFLAGS@
+ CC		= @CC@
++AR		= @AR@
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+ libdir		= @libdir@
+@@ -56,34 +57,34 @@ xlockfile.o:	lockfile.c
+ 			-c lockfile.c -o xlockfile.o
+ 
+ install_static:	static install_common
+-		install -d -m 755 -g root -p $(libdir)
+-		install -m 644 liblockfile.a $(libdir)
++		install -d -m 755 -p $(DESTDIR)$(libdir)
++		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
+ 
+ install_shared:	shared install_static install_common
+-		install -d -m 755 -g root -p $(libdir)
++		install -d -m 755 -p $(DESTDIR)$(libdir)
+ 		install -m 755 liblockfile.so \
+-			$(libdir)/liblockfile.so.$(SOVER)
+-		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
+-		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
++			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
++		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
++		ln -s liblockfile.so.$(SOVER) 	$(DESTDIR)$(libdir)/liblockfile.so
+ 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
+-		install -d -m 755 -g root -p $(includedir)
+-		install -d -m 755 -g root -p $(bindir)
+-		install -d -m 755 -g root -p $(mandir)/man1
+-		install -d -m 755 -g root -p $(mandir)/man3
+-		install -m 644 lockfile.h maillock.h $(includedir)
++		install -d -m 755 -p $(DESTDIR)$(includedir)
++		install -d -m 755 -p $(DESTDIR)$(bindir)
++		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
++		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
++		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
+ 		if [ "$(MAILGROUP)" != "" ]; then\
+-		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
++		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
+ 		else \
+-		  install -g root -m 755 dotlockfile $(bindir); \
++		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
+ 		fi
+-		install -m 644 *.1 $(mandir)/man1
+-		install -m 644 *.3 $(mandir)/man3
++		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
++		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
+ 
+ install_nfslib:	nfslib
+-		install -d -m 755 -g root -p $(nfslockdir)
+-		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
++		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
++		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
+ 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ 
+ test:		test-stamp
+-- 
+2.23.0.rc2
+
diff --git a/net-libs/liblockfile/liblockfile-1.14.ebuild b/net-libs/liblockfile/liblockfile-1.14.ebuild
deleted file mode 100644
index 5e227dcd565d..000000000000
--- a/net-libs/liblockfile/liblockfile-1.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-pkg_setup() {
-	enewgroup mail 12
-}
-
-src_prepare() {
-	default
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.15.ebuild
index 5e227dcd565d..4bd4389ffac0 100644
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.15.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib user
+inherit autotools toolchain-funcs multilib
 
 DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
+HOMEPAGE="https://www.debian.org/"
 SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
+RDEPEND="acct-group/mail"
+DEPEND="${RDEPEND}"
 
 DOCS=( Changelog README )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.13-makefile.patch"
+	"${FILESDIR}/${PN}-1.15-makefile.patch"
 )
 
-pkg_setup() {
-	enewgroup mail 12
-}
-
 src_prepare() {
 	default
 
@@ -46,3 +43,7 @@ src_configure() {
 	fi
 	econf --with-mailgroup=${grp} --enable-shared
 }
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
new file mode 100644
index 000000000000..d09b6e189d02
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="https://github.com/miquels/liblockfile"
+SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="acct-group/mail"
+DEPEND="${RDEPEND}"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.16-makefile.patch"
+)
+
+src_prepare() {
+	default
+
+	# I don't feel like making the Makefile portable
+	[[ ${CHOST} == *-darwin* ]] \
+		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
+
+	eautoreconf
+}
+
+src_configure() {
+	local grp=mail
+	if use prefix ; then
+		# we never want to use LDCONFIG
+		export LDCONFIG=${EPREFIX}/bin/true
+		# in unprivileged installs this is "mail"
+		grp=$(id -g)
+	fi
+	local myeconfargs=(
+		--with-mailgroup=${grp}
+		--enable-shared
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
index 6f49eba8f496..b030af536229 100644
--- a/net-libs/liblockfile/metadata.xml
+++ b/net-libs/liblockfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">miquels/liblockfile</remote-id>
+	</upstream>
 </pkgmetadata>