commit:     887cdf90c1eda107e05958923797c627bcd07e8d
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Fri Sep 30 00:09:25 2016 +0000
Commit:     Felix Janda <felix.janda <AT> posteo <DOT> de>
CommitDate: Sat Oct  1 19:27:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=887cdf90

net-libs/liblockfile: in tree version works

because we now have ldconfig

 net-libs/liblockfile/Manifest                      |  7 --
 net-libs/liblockfile/files/Makefile.Darwin.in      | 80 ----------------------
 .../files/liblockfile-1.06-respectflags.patch      | 18 -----
 .../files/liblockfile-1.09-no-ldconfig.patch       | 20 ------
 .../files/liblockfile-orphan-file.patch            | 19 -----
 net-libs/liblockfile/liblockfile-1.09-r99.ebuild   | 49 -------------
 net-libs/liblockfile/metadata.xml                  |  8 ---
 7 files changed, 201 deletions(-)

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
deleted file mode 100644
index 88ad3e6..0000000
--- a/net-libs/liblockfile/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Makefile.Darwin.in 2074 SHA256 
3f8f82d8f6c9664ce11eaeaed5dfb22c4aaf8481f493f5c6d06eaeadf208b54b SHA512 
cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22
 WHIRLPOOL 
71e2641ee10994fe20cad0a46bdf77cbe9e0fe2c86bd626e91f9203dcebe33f1c0179ae6f590fbc9d30f358c364498195707f8c8623275b7d340ee5922600fd3
-AUX liblockfile-1.06-respectflags.patch 665 SHA256 
c1ef8e3baa31291d5ac32e9ab76c4fcdb669852b1b3a6502fef74ced9566b386 SHA512 
560aaf84c59c90b6c19f8cd8290e54bcbe7e1e5dad226b8c332be7a67789f68d29d19bd6110ffa907c587d80dc370f68fb4db88442015723a526cb77079441d6
 WHIRLPOOL 
af77a3f10e2835c3997b1687407d08f3df9bfdbe15ac5c8846be41674c8adcfa2f53eee5baef077288744e19665cdfc58926caf21cd3ba3cd7ae226e3b4f92b9
-AUX liblockfile-1.09-no-ldconfig.patch 665 SHA256 
77e595b67a0a5c2eb7b9a769b87428b95e2981bbbdfb6816c8efc42bb89a27f9 SHA512 
8ecb0e73a9aa1a7583f4b46a69289fb9e106e563b90266077321a526190867f8bafe34b28d8e2ce170ae9fc0fb08cac87c22241ac20a43579745f53504af71b1
 WHIRLPOOL 
6157c4d94a56ec8296751728019e432689ce28fdc0d0a7d79538c3d95adf246116e63110ec7bc408d843b8263d227b96e7005b84262a1e8e1cfe367c6aed08f3
-AUX liblockfile-orphan-file.patch 613 SHA256 
5e058b5c370a6256947ae664c9f44ba0eee59d0c80dd062a032fc9ec5a216859 SHA512 
e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 WHIRLPOOL 
126933d4cc8977142c0b614d6711fde427bbee088fb465a0fe74f516a814c54bef789a304e7b9db1584cf87c86bd12bf02bffa97b227017a340de64cc10c8f73
-DIST liblockfile_1.09.orig.tar.gz 32178 SHA256 
16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f SHA512 
8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 WHIRLPOOL 
4365bd4f90207a97ec8421f60bcf2d61c4565eecc9435fd920b31ede3e182856783d21ad466632ea8d18e0378f3401637185235ef90e50d6bc10d093ae4d8a42
-EBUILD liblockfile-1.09-r99.ebuild 1144 SHA256 
9cf23c4967f86417963da3a08c7c6567187acc64bacc2bb2a4f334c2ec73e65f SHA512 
7f553dc4eba6dc23b60c0234d0b799695d51547034fdc1dae7e89839d4985efd039d7866f474ee066e22703db31bef4b5a4e2c4f89b6181549272c013d14a278
 WHIRLPOOL 
0daac3a5071083f44b90cd466efe749ddc97a701d7c5a3d09ed9682499491cb194f87567b2ab670c22a59a2bedf337bb73372d7ff878ba71d744582f2764abd2
-MISC metadata.xml 240 SHA256 
f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 
97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
 WHIRLPOOL 
a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357

diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in 
b/net-libs/liblockfile/files/Makefile.Darwin.in
deleted file mode 100644
index bdd320f..0000000
--- a/net-libs/liblockfile/files/Makefile.Darwin.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Makefile.in  Makefile for the liblockfile package (Darwin version)
-#
-# Gentoo version for Darwin, based on original:
-# version:     @(#)Makefile.in  1.01  16-Apr-1999  miqu...@cistron.nl
-#
-
-VER    = 1.0
-NVER   = 0.1
-
-CFLAGS         = @CFLAGS@ -I.
-LDFLAGS                = @LDFLAGS@
-CC             = @CC@
-
-prefix         = @prefix@
-exec_prefix    = @exec_prefix@
-bindir         = @bindir@
-libdir         = @libdir@
-mandir         = @mandir@
-nfslockdir     = @nfslockdir@
-includedir     = @includedir@
-
-MAILGROUP      = @MAILGROUP@
-
-all:           @TARGETS@
-install:       @INSTALL_TARGETS@
-
-static:                liblockfile.a dotlockfile
-shared:                liblockfile.dylib dotlockfile
-nfslib:                nfslock.$(VER).dylib
-
-liblockfile.a: lockfile.o
-               ar rv liblockfile.a lockfile.o
-
-liblockfile.dylib: liblockfile.a
-               $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name 
@libdir@/liblockfile.1.0.dylib \
-                       -o liblockfile.dylib lockfile.o -lc
-
-nfslock.$(VER).dylib:  nfslock.o
-               $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name 
nfslock.0.dylib \
-                       -o nfslock.$(NVER).dylib nfslock.o
-
-dotlockfile:   dotlockfile.o xlockfile.o
-               $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
-
-lockfile.o:    lockfile.c
-               $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
-                       -c lockfile.c
-
-xlockfile.o:   lockfile.c
-               $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
-
-install_static:        static install_common
-               install -m 644 liblockfile.a $(ROOT)$(libdir)
-
-install_shared:        shared install_common
-               install -m 755 liblockfile.dylib \
-                       $(ROOT)$(libdir)/liblockfile.$(VER).dylib
-               ln -s liblockfile.$(VER).dylib 
$(ROOT)$(libdir)/liblockfile.dylib
-
-install_common:
-               install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
-               if [ "$(MAILGROUP)" != "" ]; then\
-                 install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
-               else \
-                 install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
-               fi
-               install -m 644 *.1 $(ROOT)$(mandir)/man1
-               install -m 644 *.3 $(ROOT)$(mandir)/man3
-
-install_nfslib:        nfslib
-               install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
-
-clean:
-               rm -f *.a *.o *.dylib dotlockfile
-
-distclean:     clean
-               rm -f Makefile autoconf.h maillock.h \
-                       config.cache config.log config.status
-

diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch 
b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
deleted file mode 100644
index 1a8d0eb..0000000
--- a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: liblockfile-1.06/Makefile.in
-===================================================================
---- liblockfile-1.06.orig/Makefile.in
-+++ liblockfile-1.06/Makefile.in
-@@ -32,11 +32,11 @@ liblockfile.a:     lockfile.o
-               ar rv liblockfile.a lockfile.o
- 
- liblockfile.so: liblockfile.a
--              $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
-+              $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
-                       -o liblockfile.so lockfile.o -lc
- 
- nfslock.so.$(VER):    nfslock.o
--              $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
-+              $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
-                       -o nfslock.so.$(NVER) nfslock.o
- 
- dotlockfile:  dotlockfile.o xlockfile.o

diff --git a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch 
b/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
deleted file mode 100644
index a478fa8..0000000
--- a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/liblockfile-1.09/Makefile.in
-+++ b/liblockfile-1.09/Makefile.in
-@@ -56,7 +56,7 @@
-               install -m 755 liblockfile.so \
-                       $(ROOT)$(libdir)/liblockfile.so.$(VER)
-               ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
--              if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-+              if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
- 
- install_common:
-               install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
-@@ -70,7 +70,7 @@
- 
- install_nfslib:       nfslib
-               install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
--              if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-+              if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
- 
- clean:
-               rm -f *.a *.o *.so *.so.* dotlockfile

diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch 
b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
deleted file mode 100644
index 4a8c75a..0000000
--- a/net-libs/liblockfile/files/liblockfile-orphan-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
---- liblockfile-1.06-orig/Makefile.in  2006-11-28 06:19:09.000000000 +0100
-+++ liblockfile-1.06/Makefile.in       2006-11-28 06:24:30.000000000 +0100
-@@ -5,6 +5,7 @@
- #
- 
- VER   = 1.0
-+MVER  = 1
- NVER  = 0.1
- 
- CFLAGS                = @CFLAGS@ -I.
-@@ -55,6 +56,7 @@
- install_shared:       shared install_common
-               install -m 755 liblockfile.so \
-                       $(ROOT)$(libdir)/liblockfile.so.$(VER)
-+              ln -s liblockfile.so.$(VER) 
$(ROOT)$(libdir)/liblockfile.so.$(MVER)
-               ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
-               if test "$(ROOT)" = ""; then @LDCONFIG@; fi
- 

diff --git a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild 
b/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
deleted file mode 100644
index b8a2353..0000000
--- a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib autotools 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="amd64 arm ~mips ppc x86"
-IUSE=""
-
-pkg_setup() {
-       enewgroup mail 12
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
-       epatch "${FILESDIR}"/${PN}-1.09-no-ldconfig.patch
-       epatch "${FILESDIR}"/${PN}-orphan-file.patch
-
-       # 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
-}
-
-src_install() {
-       dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
-       emake ROOT="${D}" install
-       dodoc README Changelog
-}

diff --git a/net-libs/liblockfile/metadata.xml 
b/net-libs/liblockfile/metadata.xml
deleted file mode 100644
index 9a6d80e..0000000
--- a/net-libs/liblockfile/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
-       <email>net-m...@gentoo.org</email>
-       <name>Net-Mail</name>
-</maintainer>
-</pkgmetadata>

Reply via email to