Gentoo Archives: gentoo-commits

From: Felix Janda <felix.janda@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-libs/liblockfile/, net-libs/liblockfile/files/
Date: Sat, 01 Oct 2016 19:38:38
Message-Id: 1475350038.887cdf90c1eda107e05958923797c627bcd07e8d.doughdemon@gentoo
1 commit: 887cdf90c1eda107e05958923797c627bcd07e8d
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Fri Sep 30 00:09:25 2016 +0000
4 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de>
5 CommitDate: Sat Oct 1 19:27:18 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=887cdf90
7
8 net-libs/liblockfile: in tree version works
9
10 because we now have ldconfig
11
12 net-libs/liblockfile/Manifest | 7 --
13 net-libs/liblockfile/files/Makefile.Darwin.in | 80 ----------------------
14 .../files/liblockfile-1.06-respectflags.patch | 18 -----
15 .../files/liblockfile-1.09-no-ldconfig.patch | 20 ------
16 .../files/liblockfile-orphan-file.patch | 19 -----
17 net-libs/liblockfile/liblockfile-1.09-r99.ebuild | 49 -------------
18 net-libs/liblockfile/metadata.xml | 8 ---
19 7 files changed, 201 deletions(-)
20
21 diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
22 deleted file mode 100644
23 index 88ad3e6..0000000
24 --- a/net-libs/liblockfile/Manifest
25 +++ /dev/null
26 @@ -1,7 +0,0 @@
27 -AUX Makefile.Darwin.in 2074 SHA256 3f8f82d8f6c9664ce11eaeaed5dfb22c4aaf8481f493f5c6d06eaeadf208b54b SHA512 cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22 WHIRLPOOL 71e2641ee10994fe20cad0a46bdf77cbe9e0fe2c86bd626e91f9203dcebe33f1c0179ae6f590fbc9d30f358c364498195707f8c8623275b7d340ee5922600fd3
28 -AUX liblockfile-1.06-respectflags.patch 665 SHA256 c1ef8e3baa31291d5ac32e9ab76c4fcdb669852b1b3a6502fef74ced9566b386 SHA512 560aaf84c59c90b6c19f8cd8290e54bcbe7e1e5dad226b8c332be7a67789f68d29d19bd6110ffa907c587d80dc370f68fb4db88442015723a526cb77079441d6 WHIRLPOOL af77a3f10e2835c3997b1687407d08f3df9bfdbe15ac5c8846be41674c8adcfa2f53eee5baef077288744e19665cdfc58926caf21cd3ba3cd7ae226e3b4f92b9
29 -AUX liblockfile-1.09-no-ldconfig.patch 665 SHA256 77e595b67a0a5c2eb7b9a769b87428b95e2981bbbdfb6816c8efc42bb89a27f9 SHA512 8ecb0e73a9aa1a7583f4b46a69289fb9e106e563b90266077321a526190867f8bafe34b28d8e2ce170ae9fc0fb08cac87c22241ac20a43579745f53504af71b1 WHIRLPOOL 6157c4d94a56ec8296751728019e432689ce28fdc0d0a7d79538c3d95adf246116e63110ec7bc408d843b8263d227b96e7005b84262a1e8e1cfe367c6aed08f3
30 -AUX liblockfile-orphan-file.patch 613 SHA256 5e058b5c370a6256947ae664c9f44ba0eee59d0c80dd062a032fc9ec5a216859 SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e WHIRLPOOL 126933d4cc8977142c0b614d6711fde427bbee088fb465a0fe74f516a814c54bef789a304e7b9db1584cf87c86bd12bf02bffa97b227017a340de64cc10c8f73
31 -DIST liblockfile_1.09.orig.tar.gz 32178 SHA256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a WHIRLPOOL 4365bd4f90207a97ec8421f60bcf2d61c4565eecc9435fd920b31ede3e182856783d21ad466632ea8d18e0378f3401637185235ef90e50d6bc10d093ae4d8a42
32 -EBUILD liblockfile-1.09-r99.ebuild 1144 SHA256 9cf23c4967f86417963da3a08c7c6567187acc64bacc2bb2a4f334c2ec73e65f SHA512 7f553dc4eba6dc23b60c0234d0b799695d51547034fdc1dae7e89839d4985efd039d7866f474ee066e22703db31bef4b5a4e2c4f89b6181549272c013d14a278 WHIRLPOOL 0daac3a5071083f44b90cd466efe749ddc97a701d7c5a3d09ed9682499491cb194f87567b2ab670c22a59a2bedf337bb73372d7ff878ba71d744582f2764abd2
33 -MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
34
35 diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
36 deleted file mode 100644
37 index bdd320f..0000000
38 --- a/net-libs/liblockfile/files/Makefile.Darwin.in
39 +++ /dev/null
40 @@ -1,80 +0,0 @@
41 -#
42 -# Makefile.in Makefile for the liblockfile package (Darwin version)
43 -#
44 -# Gentoo version for Darwin, based on original:
45 -# version: @(#)Makefile.in 1.01 16-Apr-1999 miquels@×××××××.nl
46 -#
47 -
48 -VER = 1.0
49 -NVER = 0.1
50 -
51 -CFLAGS = @CFLAGS@ -I.
52 -LDFLAGS = @LDFLAGS@
53 -CC = @CC@
54 -
55 -prefix = @prefix@
56 -exec_prefix = @exec_prefix@
57 -bindir = @bindir@
58 -libdir = @libdir@
59 -mandir = @mandir@
60 -nfslockdir = @nfslockdir@
61 -includedir = @includedir@
62 -
63 -MAILGROUP = @MAILGROUP@
64 -
65 -all: @TARGETS@
66 -install: @INSTALL_TARGETS@
67 -
68 -static: liblockfile.a dotlockfile
69 -shared: liblockfile.dylib dotlockfile
70 -nfslib: nfslock.$(VER).dylib
71 -
72 -liblockfile.a: lockfile.o
73 - ar rv liblockfile.a lockfile.o
74 -
75 -liblockfile.dylib: liblockfile.a
76 - $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name @libdir@/liblockfile.1.0.dylib \
77 - -o liblockfile.dylib lockfile.o -lc
78 -
79 -nfslock.$(VER).dylib: nfslock.o
80 - $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name nfslock.0.dylib \
81 - -o nfslock.$(NVER).dylib nfslock.o
82 -
83 -dotlockfile: dotlockfile.o xlockfile.o
84 - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
85 -
86 -lockfile.o: lockfile.c
87 - $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
88 - -c lockfile.c
89 -
90 -xlockfile.o: lockfile.c
91 - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
92 -
93 -install_static: static install_common
94 - install -m 644 liblockfile.a $(ROOT)$(libdir)
95 -
96 -install_shared: shared install_common
97 - install -m 755 liblockfile.dylib \
98 - $(ROOT)$(libdir)/liblockfile.$(VER).dylib
99 - ln -s liblockfile.$(VER).dylib $(ROOT)$(libdir)/liblockfile.dylib
100 -
101 -install_common:
102 - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
103 - if [ "$(MAILGROUP)" != "" ]; then\
104 - install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
105 - else \
106 - install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
107 - fi
108 - install -m 644 *.1 $(ROOT)$(mandir)/man1
109 - install -m 644 *.3 $(ROOT)$(mandir)/man3
110 -
111 -install_nfslib: nfslib
112 - install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
113 -
114 -clean:
115 - rm -f *.a *.o *.dylib dotlockfile
116 -
117 -distclean: clean
118 - rm -f Makefile autoconf.h maillock.h \
119 - config.cache config.log config.status
120 -
121
122 diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
123 deleted file mode 100644
124 index 1a8d0eb..0000000
125 --- a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
126 +++ /dev/null
127 @@ -1,18 +0,0 @@
128 -Index: liblockfile-1.06/Makefile.in
129 -===================================================================
130 ---- liblockfile-1.06.orig/Makefile.in
131 -+++ liblockfile-1.06/Makefile.in
132 -@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o
133 - ar rv liblockfile.a lockfile.o
134 -
135 - liblockfile.so: liblockfile.a
136 -- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
137 -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
138 - -o liblockfile.so lockfile.o -lc
139 -
140 - nfslock.so.$(VER): nfslock.o
141 -- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
142 -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
143 - -o nfslock.so.$(NVER) nfslock.o
144 -
145 - dotlockfile: dotlockfile.o xlockfile.o
146
147 diff --git a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch b/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
148 deleted file mode 100644
149 index a478fa8..0000000
150 --- a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
151 +++ /dev/null
152 @@ -1,20 +0,0 @@
153 ---- a/liblockfile-1.09/Makefile.in
154 -+++ b/liblockfile-1.09/Makefile.in
155 -@@ -56,7 +56,7 @@
156 - install -m 755 liblockfile.so \
157 - $(ROOT)$(libdir)/liblockfile.so.$(VER)
158 - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
159 -- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
160 -+ if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
161 -
162 - install_common:
163 - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
164 -@@ -70,7 +70,7 @@
165 -
166 - install_nfslib: nfslib
167 - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
168 -- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
169 -+ if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
170 -
171 - clean:
172 - rm -f *.a *.o *.so *.so.* dotlockfile
173
174 diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
175 deleted file mode 100644
176 index 4a8c75a..0000000
177 --- a/net-libs/liblockfile/files/liblockfile-orphan-file.patch
178 +++ /dev/null
179 @@ -1,19 +0,0 @@
180 -diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
181 ---- liblockfile-1.06-orig/Makefile.in 2006-11-28 06:19:09.000000000 +0100
182 -+++ liblockfile-1.06/Makefile.in 2006-11-28 06:24:30.000000000 +0100
183 -@@ -5,6 +5,7 @@
184 - #
185 -
186 - VER = 1.0
187 -+MVER = 1
188 - NVER = 0.1
189 -
190 - CFLAGS = @CFLAGS@ -I.
191 -@@ -55,6 +56,7 @@
192 - install_shared: shared install_common
193 - install -m 755 liblockfile.so \
194 - $(ROOT)$(libdir)/liblockfile.so.$(VER)
195 -+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER)
196 - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
197 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi
198 -
199
200 diff --git a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild b/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
201 deleted file mode 100644
202 index b8a2353..0000000
203 --- a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
204 +++ /dev/null
205 @@ -1,49 +0,0 @@
206 -# Copyright 1999-2016 Gentoo Foundation
207 -# Distributed under the terms of the GNU General Public License v2
208 -# $Id$
209 -
210 -EAPI=4
211 -
212 -inherit eutils multilib autotools user
213 -
214 -DESCRIPTION="Implements functions designed to lock the standard mailboxes"
215 -HOMEPAGE="http://www.debian.org/"
216 -SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
217 -
218 -LICENSE="LGPL-2"
219 -SLOT="0"
220 -KEYWORDS="amd64 arm ~mips ppc x86"
221 -IUSE=""
222 -
223 -pkg_setup() {
224 - enewgroup mail 12
225 -}
226 -
227 -src_prepare() {
228 - epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
229 - epatch "${FILESDIR}"/${PN}-1.09-no-ldconfig.patch
230 - epatch "${FILESDIR}"/${PN}-orphan-file.patch
231 -
232 - # I don't feel like making the Makefile portable
233 - [[ ${CHOST} == *-darwin* ]] \
234 - && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
235 -
236 - eautoreconf
237 -}
238 -
239 -src_configure() {
240 - local grp=mail
241 - if use prefix ; then
242 - # we never want to use LDCONFIG
243 - export LDCONFIG=${EPREFIX}/bin/true
244 - # in unprivileged installs this is "mail"
245 - grp=$(id -g)
246 - fi
247 - econf --with-mailgroup=${grp} --enable-shared
248 -}
249 -
250 -src_install() {
251 - dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
252 - emake ROOT="${D}" install
253 - dodoc README Changelog
254 -}
255
256 diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
257 deleted file mode 100644
258 index 9a6d80e..0000000
259 --- a/net-libs/liblockfile/metadata.xml
260 +++ /dev/null
261 @@ -1,8 +0,0 @@
262 -<?xml version="1.0" encoding="UTF-8"?>
263 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
264 -<pkgmetadata>
265 -<maintainer type="project">
266 - <email>net-mail@g.o</email>
267 - <name>Net-Mail</name>
268 -</maintainer>
269 -</pkgmetadata>