diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-08 17:29:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-08 17:29:03 +0000 |
| commit | 4c2af3bc354b4597ba5515790131ddb9ca3139ba (patch) | |
| tree | 63ae9bdd90251febf546b0f53b13050058989340 /sys-apps | |
| parent | Version bump python to 2.6.6 (bug 334425). (diff) | |
| download | gentoo-2-4c2af3bc354b4597ba5515790131ddb9ca3139ba.tar.gz gentoo-2-4c2af3bc354b4597ba5515790131ddb9ca3139ba.tar.bz2 gentoo-2-4c2af3bc354b4597ba5515790131ddb9ca3139ba.zip | |
Remove unused Makefile.am hunk #340140 by Diego E. Pettenò.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.18-slang.patch | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index a729cbb6a4a8..b1eb37589c93 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.321 2010/10/03 20:09:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.322 2010/10/08 17:29:03 vapier Exp $ + + 08 Oct 2010; Mike Frysinger <vapier@gentoo.org> + files/util-linux-2.18-slang.patch: + Remove unused Makefile.am hunk #340140 by Diego E. Pettenò. 03 Oct 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.18-r1.ebuild, +files/util-linux-2.18-falloc.patch: diff --git a/sys-apps/util-linux/files/util-linux-2.18-slang.patch b/sys-apps/util-linux/files/util-linux-2.18-slang.patch index efbe9d79afa9..65c70d8407e6 100644 --- a/sys-apps/util-linux/files/util-linux-2.18-slang.patch +++ b/sys-apps/util-linux/files/util-linux-2.18-slang.patch @@ -7,7 +7,7 @@ Subject: [PATCH] cfdisk: fix --with-slang Signed-off-by: Karel Zak <kzak@redhat.com> --- - fdisk/Makefile.am | 2 +- + fdisk/Makefile.in | 2 +- fdisk/cfdisk.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) @@ -32,19 +32,6 @@ Signed-off-by: Karel Zak <kzak@redhat.com> @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_CFLAGS = $(cflags_blkid) @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_CFLAGS = $(cflags_blkid) @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) -diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am -index 9a9db0c..36871f3 100644 ---- a/fdisk/Makefile.am -+++ b/fdisk/Makefile.am -@@ -54,7 +54,7 @@ endif - if USE_SLANG - sbin_PROGRAMS += cfdisk - dist_man_MANS += cfdisk.8 --cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c -+cfdisk_SOURCES = cfdisk.c $(fdisk_common) - cfdisk_CFLAGS = $(cflags_blkid) - cfdisk_LDADD = -lslang $(ldadd_blkid) - else diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 30550c0..552858b 100644 --- a/fdisk/cfdisk.c |