diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-06-15 19:51:15 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-06-15 19:51:15 +0000 |
| commit | c537b1132485911beace7d6f5606437a95e7c4fc (patch) | |
| tree | e17d684142c8f2ad6ebf0adfc3e5445f38cf8c38 /sys-apps/keyutils | |
| parent | Drop useless autotools inherit. (diff) | |
| download | gentoo-2-c537b1132485911beace7d6f5606437a95e7c4fc.tar.gz gentoo-2-c537b1132485911beace7d6f5606437a95e7c4fc.tar.bz2 gentoo-2-c537b1132485911beace7d6f5606437a95e7c4fc.zip | |
Fixup the makefile-fixup patch to install correct symlinks and add gen_usr_ldscript.
(Portage version: 2.1.5.5)
Diffstat (limited to 'sys-apps/keyutils')
| -rw-r--r-- | sys-apps/keyutils/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch | 7 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.2-r2.ebuild | 36 |
3 files changed, 47 insertions, 5 deletions
diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog index 888ec1378c2b..fe3de28e186e 100644 --- a/sys-apps/keyutils/ChangeLog +++ b/sys-apps/keyutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/keyutils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.9 2008/06/07 02:48:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.10 2008/06/15 19:51:14 swegener Exp $ + +*keyutils-1.2-r2 (15 Jun 2008) + + 15 Jun 2008; Sven Wegener <swegener@gentoo.org> + files/keyutils-1.2-makefile-fixup.patch, +keyutils-1.2-r2.ebuild: + Fixup the makefile-fixup patch to install correct symlinks and add + gen_usr_ldscript. *keyutils-1.2-r1 (07 Jun 2008) diff --git a/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch index 73b7bf2258fe..8110ec69d862 100644 --- a/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch +++ b/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch @@ -14,13 +14,12 @@ diff -Nuar keyutils-1.2.orig/Makefile keyutils-1.2/Makefile $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB) -@@ -89,9 +89,7 @@ - $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) - endif +@@ -91,7 +91,7 @@ $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) -- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) mkdir -p $(DESTDIR)$(USRLIBDIR) - $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB) $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh diff --git a/sys-apps/keyutils/keyutils-1.2-r2.ebuild b/sys-apps/keyutils/keyutils-1.2-r2.ebuild new file mode 100644 index 000000000000..e2a756924de1 --- /dev/null +++ b/sys-apps/keyutils/keyutils-1.2-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.2-r2.ebuild,v 1.1 2008/06/15 19:51:14 swegener Exp $ + +inherit multilib eutils toolchain-funcs + +DESCRIPTION="Linux Key Management Utilities" +HOMEPAGE="http://www.kernel.org/" +SRC_URI="http://people.redhat.com/~dhowells/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +DEPEND=">=sys-kernel/linux-headers-2.6.11" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${PN}-1.2-makefile-fixup.patch + cd "${S}" + sed -i \ + -e '/CFLAGS/s|:= -g -O2|+=|' \ + Makefile || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + LIBDIR="/$(get_libdir)" \ + USRLIBDIR="/usr/$(get_libdir)" \ + install || die + dodoc README + + gen_usr_ldscript libkeyutils.so +} |