[gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/, net-libs/liblockfile/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/, net-libs/liblockfile/files/

[Lars Wendler]

commit:     9e662e02cb3d89fde4d47fc67efae80f7c230e07
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 10:29:13 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 10:29:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e662e02

net-libs/liblockfile: Bump to version 1.16

Use GitHub upstream instead of Debian mirror

Thanks-to: Thomas Deutschmann <whissi <AT> gentoo.org>
Closes: https://bugs.gentoo.org/691706
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-libs/liblockfile/Manifest                      |  1 +
 .../files/liblockfile-1.16-makefile.patch          | 80 ++++++++++++++++++++++
 net-libs/liblockfile/liblockfile-1.16.ebuild       | 60 ++++++++++++++++
 net-libs/liblockfile/metadata.xml                  |  5 +-
 4 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index a0d13e20200..89b1142b189 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,3 +1,4 @@
+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.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
 DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0

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 00000000000..656ccd3c494
--- /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 -g root -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 -g root -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 -g root -p $(DESTDIR)$(includedir)
++		install -d -m 755 -g root -p $(DESTDIR)$(bindir)
++		install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
++		install -d -m 755 -g root -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 -g root -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 -g root -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.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
new file mode 100644
index 00000000000..d09b6e189d0
--- /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 6f49eba8f49..b030af53622 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>