public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/, net-libs/liblockfile/
@ 2017-01-10 23:09 Lars Wendler
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2017-01-10 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     73b69a3b18fa546f6d61d6e2521803cf4969f004
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 23:08:53 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 23:09:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b69a3b

net-libs/liblockfile: Bump to version 1.13

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/liblockfile/Manifest                      |  1 +
 .../files/liblockfile-1.13-makefile.patch          | 63 ++++++++++++++++++++++
 net-libs/liblockfile/liblockfile-1.13.ebuild       | 49 +++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3d66347..2e62f5a 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,2 +1,3 @@
 DIST liblockfile_1.09.orig.tar.gz 32178 SHA256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a WHIRLPOOL 4365bd4f90207a97ec8421f60bcf2d61c4565eecc9435fd920b31ede3e182856783d21ad466632ea8d18e0378f3401637185235ef90e50d6bc10d093ae4d8a42
 DIST liblockfile_1.10.orig.tar.gz 43617 SHA256 f58db53e4b558734bf7f33f96085d803126bdde2a434cd01eeface42a5539b2c SHA512 fa38d16d7af787ca47d6adaa87abb50af0ec1d4ae9d6e7eb8e77f58c44e974dc99a79bd648ded4f539b00540a513d8e40742b706b242365f3ffdf0cf392f618d WHIRLPOOL 4cb36e31eb1454ed8d78ca47926737c4bccb1152e66273d1097ae354d8f67cbde6bc987ff5bef5fb202425c9641cc7c762ceaf6c640adff5daca59d61dded0f1
+DIST liblockfile_1.13.orig.tar.gz 67720 SHA256 5c5622dbcb5366c8f0c96f9df4f5b1fe3807cdca6faee58a460da8ed7e071d03 SHA512 509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a WHIRLPOOL 4b38d0d7c2a3e2091e44e1c161e73ba4b764b09a9fda3c4bd26ccabe0f3ad7ed3666f508814e3a8a6fa1aa7ddc0d39943730292e8aff02fac31253a6db9d5954

diff --git a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
new file mode 100644
index 00000000..f325b5e
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
@@ -0,0 +1,63 @@
+--- liblockfile/Makefile.in
++++ liblockfile/Makefile.in
+@@ -10,7 +10,7 @@
+ LDFLAGS		= @LDFLAGS@
+ CC		= @CC@
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+ libdir		= @libdir@
+@@ -49,34 +49,34 @@
+ 		$(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 -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
+ 
+ clean:

diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.13.ebuild
new file mode 100644
index 00000000..b3cf7a2
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/, net-libs/liblockfile/
@ 2019-08-08 15:01 Thomas Deutschmann
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Deutschmann @ 2019-08-08 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     0af6bf4d10b5b494cc7c0cc7c220329ab7d78d7e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 14:58:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 15:00:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af6bf4d

net-libs/liblockfile: Export AR; Don't run tests when not requested

Closes: https://bugs.gentoo.org/468156
Bug: https://bugs.gentoo.org/691706
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/liblockfile-1.15-makefile.patch          | 74 ++++++++++++++++++++++
 net-libs/liblockfile/liblockfile-1.15.ebuild       | 10 ++-
 2 files changed, 81 insertions(+), 3 deletions(-)

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 00000000000..952a5703b5d
--- /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/liblockfile-1.15.ebuild b/net-libs/liblockfile/liblockfile-1.15.ebuild
index bcfa527efdc..4bd4389ffac 100644
--- a/net-libs/liblockfile/liblockfile-1.15.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.15.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit autotools multilib
+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"
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}"
 DOCS=( Changelog README )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.13-makefile.patch"
+	"${FILESDIR}/${PN}-1.15-makefile.patch"
 )
 
 src_prepare() {
@@ -43,3 +43,7 @@ src_configure() {
 	fi
 	econf --with-mailgroup=${grp} --enable-shared
 }
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-08-08 15:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-08 15:01 [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/, net-libs/liblockfile/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2017-01-10 23:09 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox