Remove unused Makefile.am hunk #340140 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

3 files changed, 11 insertions, 20 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/Manifest b/sys-apps/util-linux/Manifest
index 8004c75b5b34..821875c6a69b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,7 +6,7 @@ AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1
 AUX util-linux-2.18-cfdisk-string-len.patch 1683 RMD160 a96c6e3e58155ec337d9c0b6332f9dc097929cd4 SHA1 a74e8bf9ed61b4f726d986d4468e03b0169b107d SHA256 6f9203bf6ab5c9c3985f18d39f95e01dea00738496ec9d4b9b01a32d49cb7781
 AUX util-linux-2.18-falloc.patch 972 RMD160 19b8168a405c0a0856a1d0d2f5bdf7b8a4254d1d SHA1 9613abeae05082964284ef8ef9c149d2ad49e31e SHA256 632467f3b6d4384e05890468ecf25653a07a6ab35708e5b4bc9a2e46d73469f5
 AUX util-linux-2.18-ncursesw.patch 2163 RMD160 dbf1cd9fbb6c017d0980a7a18064793517f17b69 SHA1 542dcfb520407df8c4b44df967164a7bd632d710 SHA256 e36b3ac4ee5084baa8db5b1d20b4ef07e4061913645718a576b09100d910fed5
-AUX util-linux-2.18-slang.patch 3412 RMD160 1fcb0ab2770bd5c2702ab984e533d8bb02d66257 SHA1 6a244f0c4c8982ac4a7dd2d0e13b88ca5a7638dc SHA256 e0dc6a468ac641a47b06d878eda95d56c63683d22423cc87471b0546cffbbc2c
+AUX util-linux-2.18-slang.patch 3000 RMD160 dade7c73b8a1b1f3e40a7fd2090be7ccab69bdc6 SHA1 2cde75d7b0d8ce8b671acfb5252423790354a9d3 SHA256 d373ba30d0d60913880fabb4ea2b8adb3a0bca8ca6994c1bb0bb16148dbc41d4
 DIST util-linux-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0
 DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
 DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f213558d5c70202e SHA1 c36d29f27a2ce3f2ec746ae48712ae8ea74af856 SHA256 cde75f181eb998316a7d695da3c93b1894de3cc2b45df2f2c3f21e8b0280b4a4
@@ -14,12 +14,12 @@ DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d
 EBUILD util-linux-2.17.2.ebuild 3028 RMD160 bdc2fdd1d3f3ff61b98a74d7e449c11404e6dd4f SHA1 657e44b9e330468a8e1a4a32f772d636813e59e8 SHA256 19f04f2948416d5ce9c598f0bf159e75fd7d70ad1653a35c98b05839d8baeddf
 EBUILD util-linux-2.18-r1.ebuild 3253 RMD160 83af54588e9daafcb38eda85433dfed0cc04e956 SHA1 edecbabfc2ef71fc3e5b64d3ced964eb9479b482 SHA256 45a110c47f5cfdbc896895c06dac6bd8eacf0bfd4a641be263fd923e4d1f7fdd
 EBUILD util-linux-9999.ebuild 3057 RMD160 99092b9db2f5fad5e1d4d7ea5028182a0a5df9df SHA1 d39ae6544a28b9973f69b94321b21b9fd089c049 SHA256 0516d07aed00faee00dcca4ab29e35bc0e87aedf3a25b4e0ca3d5288b5b56295
-MISC ChangeLog 48791 RMD160 607cbb13e45170f9d8334b7ff99d204b3715380e SHA1 5ae2713acf61186bad622a1cf216d391683842df SHA256 894e9c86403398f06eaae3baea0351b88d64778b479bb9db25cec8ce98a6d569
+MISC ChangeLog 48942 RMD160 8d0cfa40edd074666aadf1a5550cb6c181dee243 SHA1 c77c5b80ec09967566febc2418d622b778c12bcd SHA256 06011b9cb05122e525d3ded7efc422b72421f5cc1b26c5c721f7b28346a1e9c4
 MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyo4u8ACgkQTwhj9JtAlp7XVAD9FDpmIACJ6qppbPVwNEfZOs3Z
-X98NNpsViSZLvGLLVgsA/ilLa0Lsp/1fj/t9+wLwjob6GKIGrzp10YGTmvtzvYKK
-=BoNs
+iF4EAREIAAYFAkyvVH0ACgkQTwhj9JtAlp6UpgEAuttBCtupU/7zKpGXx2OKc2af
+EDiU49Nmf+nLpxhqF3IA/3wgwMMzVjHLIoRB+2SZIZ9Ztn32uvTiQOiEVHORm8gS
+=G4m2
 -----END PGP SIGNATURE-----
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