Fixed Makefile to work properly with --as-needed. Closes bug #135152. Removing old version.

(Portage version: 2.1_rc3-r3)
 (Signed Manifest commit)

5 files changed, 23 insertions, 207 deletions

diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 19012c37789f..68acfd747780 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,11 +1,6 @@
-AUX 2.5.3/compaq_segments.patch 478 RMD160 a31b6197ded598606389d590d6c36d5a5853203c SHA1 1478944613e3118df9ea26590482689556b55671 SHA256 943748998e15b603fdd66a137903a4486b0b98c935a589c297d9c446ef93557e
-MD5 fea531c10f3cb1d47c0f0af40bad0fa9 files/2.5.3/compaq_segments.patch 478
-RMD160 a31b6197ded598606389d590d6c36d5a5853203c files/2.5.3/compaq_segments.patch 478
-SHA256 943748998e15b603fdd66a137903a4486b0b98c935a589c297d9c446ef93557e files/2.5.3/compaq_segments.patch 478
-AUX 2.5.3/md_expand.patch 2152 RMD160 e795ba20bc9d525705b5b22f7c5b68e56ce6ae2c SHA1 04b76c433ec06e58f974d4744f1e4bc2c1be7cbf SHA256 56f5996874159ce456fcdc72b93aa9ac9011c4be93b2a2954fef8c75046fe85b
-MD5 fbf48e09c52473403af443f9ee5d8403 files/2.5.3/md_expand.patch 2152
-RMD160 e795ba20bc9d525705b5b22f7c5b68e56ce6ae2c files/2.5.3/md_expand.patch 2152
-SHA256 56f5996874159ce456fcdc72b93aa9ac9011c4be93b2a2954fef8c75046fe85b files/2.5.3/md_expand.patch 2152
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.5.5/md_super_fix.patch 2618 RMD160 331da16472918dd5029fdf07b9f51378b493daa6 SHA1 566df932d383b247af8236f5f6e679d4a9997421 SHA256 ade82c9d21c14486592a1aac347361c2fd207dac9634dae9f55225c302b21f5d
 MD5 e48c5d6f6536b378e4f4d38e3187b8e7 files/2.5.5/md_super_fix.patch 2618
 RMD160 331da16472918dd5029fdf07b9f51378b493daa6 files/2.5.5/md_super_fix.patch 2618
@@ -14,38 +9,41 @@ AUX 2.5.5/raid5_degrade_fix.patch 1533 RMD160 0cfc05d686faf41abc5f9363c3a59833ce
 MD5 06dd078a53af7de2b7d8b287fd91b874 files/2.5.5/raid5_degrade_fix.patch 1533
 RMD160 0cfc05d686faf41abc5f9363c3a59833ce04811a files/2.5.5/raid5_degrade_fix.patch 1533
 SHA256 8c2eb03ec4d18150349ca91344e5d63e9a807e3033760baae69f5110e36c2a2c files/2.5.5/raid5_degrade_fix.patch 1533
+AUX evms-2.5.5-as-needed.patch 482 RMD160 ebef1e696e0490ebd2c530909c03ec96b52ddacf SHA1 33036586112b7c9cac0977a1d3df9be5e665d661 SHA256 695811a6a22a17a2d7247a7109a3d081d4b3d376f6fdce1c64f2a574b9acdf3b
+MD5 19e17ea80b35e5574777ed8e42b4210a files/evms-2.5.5-as-needed.patch 482
+RMD160 ebef1e696e0490ebd2c530909c03ec96b52ddacf files/evms-2.5.5-as-needed.patch 482
+SHA256 695811a6a22a17a2d7247a7109a3d081d4b3d376f6fdce1c64f2a574b9acdf3b files/evms-2.5.5-as-needed.patch 482
 AUX evms2-start.sh 382 RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a SHA1 0d84590bd35b9ef91d74eb55456f0b8e56079ed1 SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021
 MD5 5eb632aa94b0537e1983f935e3706d74 files/evms2-start.sh 382
 RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a files/evms2-start.sh 382
 SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021 files/evms2-start.sh 382
-DIST evms-2.5.3.tar.gz 2239383
-DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
-EBUILD evms-2.5.3-r1.ebuild 2427 RMD160 dde95093f500195860d3982835de1e3c5bceb6d2 SHA1 05921b1c8e4a1a8d8da97c15ceeb9eb765fbd902 SHA256 77b81af199f49601526139c22baa2e075311bc021fdcedc789aaafa1f4f1015d
-MD5 a65a8d5f94a287aac2e99eee6c70d7b3 evms-2.5.3-r1.ebuild 2427
-RMD160 dde95093f500195860d3982835de1e3c5bceb6d2 evms-2.5.3-r1.ebuild 2427
-SHA256 77b81af199f49601526139c22baa2e075311bc021fdcedc789aaafa1f4f1015d evms-2.5.3-r1.ebuild 2427
-EBUILD evms-2.5.5-r1.ebuild 2463 RMD160 9d6cc8721f4caf2c6a375b99331703b064bb1b2b SHA1 7a48d2356a62538b7d3a1349adbdee7a0758e4a4 SHA256 dfc0f34a30002df449d29d8e77078a1eb91a06ea0577faeb028e72c692ed0bc4
-MD5 11311406bc4d737d0fcd04888e6ba2d3 evms-2.5.5-r1.ebuild 2463
-RMD160 9d6cc8721f4caf2c6a375b99331703b064bb1b2b evms-2.5.5-r1.ebuild 2463
-SHA256 dfc0f34a30002df449d29d8e77078a1eb91a06ea0577faeb028e72c692ed0bc4 evms-2.5.5-r1.ebuild 2463
+DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
+EBUILD evms-2.5.5-r1.ebuild 2515 RMD160 03ca293346195d464f670ab906666f5aa482ad48 SHA1 a9e667a1b9c22e53251261c056e1de40d1c1d056 SHA256 8005e28cb916537dcba564162568acb4fea842ba0afada5c452e842804cb2768
+MD5 38d51a1fbdb9512a19d7c7b9ea80be39 evms-2.5.5-r1.ebuild 2515
+RMD160 03ca293346195d464f670ab906666f5aa482ad48 evms-2.5.5-r1.ebuild 2515
+SHA256 8005e28cb916537dcba564162568acb4fea842ba0afada5c452e842804cb2768 evms-2.5.5-r1.ebuild 2515
 EBUILD evms-2.5.5.ebuild 2457 RMD160 7200163664f1b08384ae3bbfcc042087ef9295d7 SHA1 05d216a2424f5ba417f36ee723d9e3e506a5d268 SHA256 49483ead3b7d238d4a0ef4c10dbac228fbaaeaab88ebf07594a0e8a560caaa6d
 MD5 bba355becadbd0eac6140a1df877a772 evms-2.5.5.ebuild 2457
 RMD160 7200163664f1b08384ae3bbfcc042087ef9295d7 evms-2.5.5.ebuild 2457
 SHA256 49483ead3b7d238d4a0ef4c10dbac228fbaaeaab88ebf07594a0e8a560caaa6d evms-2.5.5.ebuild 2457
-MISC ChangeLog 10843 RMD160 49a0073d703368922696f179f5282ae5664dfb1b SHA1 c43fd0fe33a75c048735b50a64fa5ed50f39d108 SHA256 83fed9e58e0485f1dfd5988696f259abef39d718271aa580a6c45479f2d82333
-MD5 345b5c097412496b7de4e8dbf90084bb ChangeLog 10843
-RMD160 49a0073d703368922696f179f5282ae5664dfb1b ChangeLog 10843
-SHA256 83fed9e58e0485f1dfd5988696f259abef39d718271aa580a6c45479f2d82333 ChangeLog 10843
+MISC ChangeLog 11153 RMD160 28db3f82dbc0bdb86f4b556e7c65d418bfce3ef0 SHA1 ddddfbc41b42177c30145c275cfaf219fe148ecd SHA256 82f2168041e5afa485a87b8961d9493fe144551c0151c0f220c5da7c73116e26
+MD5 8135e9c88a4f90d3cee13e08a0dcb41d ChangeLog 11153
+RMD160 28db3f82dbc0bdb86f4b556e7c65d418bfce3ef0 ChangeLog 11153
+SHA256 82f2168041e5afa485a87b8961d9493fe144551c0151c0f220c5da7c73116e26 ChangeLog 11153
 MISC metadata.xml 387 RMD160 17a7b8226f7c5ef9dd45acd6fa6c9cfe7ba6dcc2 SHA1 1f4e79e4972fd749331a9260389aef08ace8c01e SHA256 b63984a06d4d8c776e0a1bffb39f36e1835e730d2636ff2a15550b17bb52eb03
 MD5 59d559390ca6a6d365a5d6c3012c0343 metadata.xml 387
 RMD160 17a7b8226f7c5ef9dd45acd6fa6c9cfe7ba6dcc2 metadata.xml 387
 SHA256 b63984a06d4d8c776e0a1bffb39f36e1835e730d2636ff2a15550b17bb52eb03 metadata.xml 387
-MD5 2769ffa4ae1f09667ac42e94da8036ba files/digest-evms-2.5.3-r1 63
-RMD160 f3bcc4f4915f04c44327a58436ba4d9c9d614c02 files/digest-evms-2.5.3-r1 63
-SHA256 34b821017208669e49f9550fd6d718622704964a45fc2fab7daff6a39aca839e files/digest-evms-2.5.3-r1 63
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5 235
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r1 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r1 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEf1sNOpjtAl+gMRURAkh1AKDIOz1qPqaOCFC2I7kGZIHEpGlKEwCfd4ok
+pRzvFpzG5pEjZCF8cRQbzRU=
+=sll0
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/evms/evms-2.5.3-r1.ebuild b/sys-fs/evms/evms-2.5.3-r1.ebuild
deleted file mode 100644
index 1a6bc880525e..000000000000
--- a/sys-fs/evms/evms-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.3-r1.ebuild,v 1.6 2006/02/07 02:38:17 agriffis Exp $
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE="ncurses gtk"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	sys-fs/device-mapper
-	>=sys-apps/baselayout-1.9.4-r6
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses
-	           =dev-libs/glib-1* )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/compaq_segments.patch
-	epatch ${FILESDIR}/${PV}/md_expand.patch
-}
-
-src_compile() {
-	# Bug #54856
-	# filter-flags "-fstack-protector"
-	replace-flags -O3 -O2
-	replace-flags -Os -O2
-
-	local excluded_interfaces=""
-	use ncurses || excluded_interfaces="--disable-text-mode"
-	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--sbindir=/sbin \
-		--includedir=/usr/include \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Make install died"
-	dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/evms2-start.sh evms-start.sh || die "rcscript addon failed"
-
-	# install the sample configuration into the doc dir
-	dodoc ${D}/etc/evms.conf.sample
-	rm -f ${D}/etc/evms.conf.sample
-
-	# the kernel patches may come handy for people compiling their own kernel
-	docinto kernel/2.4
-	dodoc kernel/2.4/*
-	docinto kernel/2.6
-	dodoc kernel/2.6/*
-
-	# move static libraries to /usr/lib
-	dodir /usr/$(get_libdir)
-	mv -f ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir)
-
-	# Create linker scripts for dynamic libs in /lib, else gcc
-	# links to the static ones in /usr/lib first.  Bug #4411.
-	for x in ${D}/usr/$(get_libdir)/*.a
-	do
-		if [ -f ${x} ]
-		then
-			local lib="${x##*/}"
-			gen_usr_ldscript ${lib/\.a/\.so}
-		fi
-	done
-
-	# the gtk+ frontend should live in /usr/sbin
-	if use gtk
-	then
-		dodir /usr/sbin
-		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	# Needed for bug #51252
-	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
-}
diff --git a/sys-fs/evms/files/2.5.3/compaq_segments.patch b/sys-fs/evms/files/2.5.3/compaq_segments.patch
deleted file mode 100644
index f1a90135cf39..000000000000
--- a/sys-fs/evms/files/2.5.3/compaq_segments.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix typo in compaq segment naming.
-
-Apply with:
-cd /usr/src/evms-2.5.3
-patch -p1 < compaq_segments.patch
-make install
-
---- evms-2.5.3a/plugins/dos/segs.c	10 Jun 2005 13:20:19 -0000
-+++ evms-2.5.3b/plugins/dos/segs.c	12 Jun 2005 12:52:02 -0000
-@@ -211,7 +211,7 @@
- 				char junk1[64];
- 				unsigned int junk2, junk3;
- 
--				rc = sscanf(name, "%63[^/]c%ud%u",
-+				rc = sscanf(name, "%63[^/]/c%ud%u",
- 					    junk1, &junk2, &junk3);
- 				if (rc == 3) {
- 					strcat(name, "p");
diff --git a/sys-fs/evms/files/2.5.3/md_expand.patch b/sys-fs/evms/files/2.5.3/md_expand.patch
deleted file mode 100644
index 3b8d9eadb763..000000000000
--- a/sys-fs/evms/files/2.5.3/md_expand.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- evms-2.5.3.a/plugins/md/md_main.c	2005-02-14 18:38:53.000000000 -0600
-+++ evms-2.5.3.b/plugins/md/md_main.c	2005-07-13 23:32:12.000000000 -0500
-@@ -1135,9 +1135,9 @@
- 				goto out;
- 			}
- 			if (org->saved_info) {
--				new_member->saved_info = EngFncs->engine_alloc(sizeof(*(org->saved_info)));
-+				new_member->saved_info = EngFncs->engine_alloc(MD_SAVED_INFO_BYTES);
- 				if (new_member->saved_info) {
--					*(new_member->saved_info) = *(org->saved_info);
-+					memcpy(new_member->saved_info, org->saved_info, MD_SAVED_INFO_BYTES);
- 				} else {
- 					rc = ENOMEM;
- 					goto out;
-@@ -1173,6 +1173,7 @@
- 	new_vol = md_allocate_volume();
- 	if (new_vol) {
- 		*new_vol = *org;
-+		new_vol->private_data = 0;
- 		new_vol->nr_disks = 0;
- 		new_vol->members = EngFncs->allocate_list();
- 		new_vol->setup_funcs = EngFncs->allocate_list();
---- evms-2.5.3.a/plugins/md/raid5_mgr.c	2005-05-27 13:46:14.000000000 -0500
-+++ evms-2.5.3.b/plugins/md/raid5_mgr.c	2005-07-13 17:57:54.000000000 -0500
-@@ -67,9 +67,16 @@
- 
- static void raid5_free_private_data(md_volume_t * volume)
- {
--	raid5_conf_t * conf = (raid5_conf_t *)volume->private_data;
-+	raid5_conf_t * conf;
- 
- 	LOG_ENTRY();
-+	if (!volume) {
-+		LOG_WARNING("Volume is NULL!!!.\n");
-+		LOG_EXIT_VOID();
-+		return;
-+	}
-+
-+	conf = (raid5_conf_t *)volume->private_data;
- 
- 	if (!conf) {
- 		LOG_WARNING("Nothing to free!!!.\n");
-@@ -1990,7 +1997,6 @@
- {
- 	int     rc;
- 	md_volume_t * volume = (md_volume_t *) region->private_data;
--	raid5_conf_t * conf = mdvol_to_conf(volume);
- 	
- 	LOG_ENTRY();
- 
-@@ -2007,7 +2013,7 @@
- 		/* Remove the parent/child associations with the PVs. */
- 		md_clear_child_list(region, children);
- 
--		EngFncs->engine_free(conf);
-+		raid5_free_private_data(volume);
- 		/* Delete the volume. */
- 		md_delete_volume(volume, tear_down);
- 		region->private_data = NULL;
-@@ -5640,9 +5646,10 @@
- static void free_region (storage_object_t *region)
- {
- 	md_volume_t * volume = (md_volume_t *)region->private_data;
--	raid5_conf_t * conf = mdvol_to_conf(volume);
- 
--	EngFncs->engine_free(conf);
-+	LOG_ENTRY();
-+
-+	raid5_free_private_data(volume);
- 
- 	md_free_volume(volume);
- 	LOG_EXIT_VOID();
diff --git a/sys-fs/evms/files/digest-evms-2.5.3-r1 b/sys-fs/evms/files/digest-evms-2.5.3-r1
deleted file mode 100644
index d3ac22f759f3..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 702c57921292934bb6c393a2c28c73ba evms-2.5.3.tar.gz 2239383