summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-01-04 23:37:45 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-01-04 23:37:45 +0000
commit8e0b3cac361564e1f58f45b0aa472fb100ea1701 (patch)
tree8c0b788467d54f588add40407f0c5ebbfb05afb8 /sys-apps
parentClean up old versions, stable has been in the tree for 11 months. (diff)
downloadgentoo-2-8e0b3cac361564e1f58f45b0aa472fb100ea1701.tar.gz
gentoo-2-8e0b3cac361564e1f58f45b0aa472fb100ea1701.tar.bz2
gentoo-2-8e0b3cac361564e1f58f45b0aa472fb100ea1701.zip
Missed a file cleanup.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/keyutils/ChangeLog6
-rw-r--r--sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch42
2 files changed, 5 insertions, 43 deletions
diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 64432e0acdd9..0929b527f478 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/keyutils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.37 2014/01/04 23:34:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.38 2014/01/04 23:37:45 robbat2 Exp $
+
+ 04 Jan 2014; Robin H. Johnson <robbat2@gentoo.org>
+ -files/keyutils-1.5.3-makefile-fixup.patch:
+ Missed a file cleanup.
04 Jan 2014; Robin H. Johnson <robbat2@gentoo.org>
-files/keyutils-1.2-makefile-fixup.patch, -keyutils-1.0.ebuild,
diff --git a/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch
deleted file mode 100644
index b0e8add18488..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 13:30:30 -0400
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9e3fa9b..46695d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makefile
- %.o: %.c keyutils.h Makefile
- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-
--keyctl: keyctl.o -lkeyutils
-+keyctl: keyctl.o $(DEVELLIB)
- $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
-
--request-key: request-key.o -lkeyutils
-+request-key: request-key.o $(DEVELLIB)
- $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
-
--key.dns_resolver: key.dns_resolver.o -lkeyutils
-+key.dns_resolver: key.dns_resolver.o $(DEVELLIB)
- $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
-
- ###############################################################################
-@@ -91,7 +91,7 @@
- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- $(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
---
-1.7.6
-