Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/, net-libs/liblockfile/files/
Date: Tue, 13 Aug 2019 10:30:24
Message-Id: 1565692153.9e662e02cb3d89fde4d47fc67efae80f7c230e07.polynomial-c@gentoo
1 commit: 9e662e02cb3d89fde4d47fc67efae80f7c230e07
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 13 10:29:13 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 13 10:29:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e662e02
7
8 net-libs/liblockfile: Bump to version 1.16
9
10 Use GitHub upstream instead of Debian mirror
11
12 Thanks-to: Thomas Deutschmann <whissi <AT> gentoo.org>
13 Closes: https://bugs.gentoo.org/691706
14 Package-Manager: Portage-2.3.71, Repoman-2.3.17
15 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
16
17 net-libs/liblockfile/Manifest | 1 +
18 .../files/liblockfile-1.16-makefile.patch | 80 ++++++++++++++++++++++
19 net-libs/liblockfile/liblockfile-1.16.ebuild | 60 ++++++++++++++++
20 net-libs/liblockfile/metadata.xml | 5 +-
21 4 files changed, 145 insertions(+), 1 deletion(-)
22
23 diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
24 index a0d13e20200..89b1142b189 100644
25 --- a/net-libs/liblockfile/Manifest
26 +++ b/net-libs/liblockfile/Manifest
27 @@ -1,3 +1,4 @@
28 +DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
29 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
30 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
31 DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0
32
33 diff --git a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
34 new file mode 100644
35 index 00000000000..656ccd3c494
36 --- /dev/null
37 +++ b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
38 @@ -0,0 +1,80 @@
39 +From 31cb6368b7feabfba37388050523667acd8942ac Mon Sep 17 00:00:00 2001
40 +From: Thomas Deutschmann <whissi@g.o>
41 +Date: Tue, 13 Aug 2019 12:19:35 +0200
42 +Subject: [PATCH] Makefile.in: Export AR; Don't use DESTDIR in prefix
43 + definition.
44 +
45 +---
46 + Makefile.in | 37 +++++++++++++++++++------------------
47 + 1 file changed, 19 insertions(+), 18 deletions(-)
48 +
49 +diff --git a/Makefile.in b/Makefile.in
50 +index 2721b48..798c603 100644
51 +--- a/Makefile.in
52 ++++ b/Makefile.in
53 +@@ -9,8 +9,9 @@ NFSVER = 0.1
54 + CFLAGS = @CFLAGS@ -I.
55 + LDFLAGS = @LDFLAGS@
56 + CC = @CC@
57 ++AR = @AR@
58 +
59 +-prefix = $(DESTDIR)@prefix@
60 ++prefix = @prefix@
61 + exec_prefix = @exec_prefix@
62 + bindir = @bindir@
63 + libdir = @libdir@
64 +@@ -56,34 +57,34 @@ xlockfile.o: lockfile.c
65 + -c lockfile.c -o xlockfile.o
66 +
67 + install_static: static install_common
68 +- install -d -m 755 -g root -p $(libdir)
69 +- install -m 644 liblockfile.a $(libdir)
70 ++ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
71 ++ install -m 644 liblockfile.a $(DESTDIR)$(libdir)
72 +
73 + install_shared: shared install_static install_common
74 +- install -d -m 755 -g root -p $(libdir)
75 ++ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
76 + install -m 755 liblockfile.so \
77 +- $(libdir)/liblockfile.so.$(SOVER)
78 +- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
79 +- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
80 ++ $(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
81 ++ ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
82 ++ ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
83 + if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
84 +
85 + install_common:
86 +- install -d -m 755 -g root -p $(includedir)
87 +- install -d -m 755 -g root -p $(bindir)
88 +- install -d -m 755 -g root -p $(mandir)/man1
89 +- install -d -m 755 -g root -p $(mandir)/man3
90 +- install -m 644 lockfile.h maillock.h $(includedir)
91 ++ install -d -m 755 -g root -p $(DESTDIR)$(includedir)
92 ++ install -d -m 755 -g root -p $(DESTDIR)$(bindir)
93 ++ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
94 ++ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man3
95 ++ install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
96 + if [ "$(MAILGROUP)" != "" ]; then\
97 +- install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
98 ++ install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
99 + else \
100 +- install -g root -m 755 dotlockfile $(bindir); \
101 ++ install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
102 + fi
103 +- install -m 644 *.1 $(mandir)/man1
104 +- install -m 644 *.3 $(mandir)/man3
105 ++ install -m 644 *.1 $(DESTDIR)$(mandir)/man1
106 ++ install -m 644 *.3 $(DESTDIR)$(mandir)/man3
107 +
108 + install_nfslib: nfslib
109 +- install -d -m 755 -g root -p $(nfslockdir)
110 +- install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
111 ++ install -d -m 755 -g root -p $(DESTDIR)$(nfslockdir)
112 ++ install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
113 + if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
114 +
115 + test: test-stamp
116 +--
117 +2.23.0.rc2
118 +
119
120 diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
121 new file mode 100644
122 index 00000000000..d09b6e189d0
123 --- /dev/null
124 +++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
125 @@ -0,0 +1,60 @@
126 +# Copyright 1999-2019 Gentoo Authors
127 +# Distributed under the terms of the GNU General Public License v2
128 +
129 +EAPI=7
130 +
131 +inherit autotools toolchain-funcs multilib
132 +
133 +DESCRIPTION="Implements functions designed to lock the standard mailboxes"
134 +HOMEPAGE="https://github.com/miquels/liblockfile"
135 +SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
136 +
137 +LICENSE="LGPL-2"
138 +SLOT="0"
139 +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"
140 +IUSE="static-libs"
141 +
142 +RDEPEND="acct-group/mail"
143 +DEPEND="${RDEPEND}"
144 +
145 +DOCS=( Changelog README )
146 +
147 +PATCHES=(
148 + "${FILESDIR}/${PN}-1.16-makefile.patch"
149 +)
150 +
151 +src_prepare() {
152 + default
153 +
154 + # I don't feel like making the Makefile portable
155 + [[ ${CHOST} == *-darwin* ]] \
156 + && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
157 +
158 + eautoreconf
159 +}
160 +
161 +src_configure() {
162 + local grp=mail
163 + if use prefix ; then
164 + # we never want to use LDCONFIG
165 + export LDCONFIG=${EPREFIX}/bin/true
166 + # in unprivileged installs this is "mail"
167 + grp=$(id -g)
168 + fi
169 + local myeconfargs=(
170 + --with-mailgroup=${grp}
171 + --enable-shared
172 + )
173 + econf "${myeconfargs[@]}"
174 +}
175 +
176 +src_compile() {
177 + emake AR="$(tc-getAR)"
178 +}
179 +
180 +src_install() {
181 + default
182 + if ! use static-libs ; then
183 + find "${ED}" -type f -name "*.a" -delete || die
184 + fi
185 +}
186
187 diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
188 index 6f49eba8f49..b030af53622 100644
189 --- a/net-libs/liblockfile/metadata.xml
190 +++ b/net-libs/liblockfile/metadata.xml
191 @@ -1,5 +1,8 @@
192 <?xml version="1.0" encoding="UTF-8"?>
193 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
194 <pkgmetadata>
195 -<!-- maintainer-needed -->
196 + <!-- maintainer-needed -->
197 + <upstream>
198 + <remote-id type="github">miquels/liblockfile</remote-id>
199 + </upstream>
200 </pkgmetadata>