Added conditional pkg-config dependencies for USE-flags gtk and ncurses (bug #204707), moved patches into tarball.

Package-Manager: portage-2.1.4

4 files changed, 28 insertions, 34 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 5f1a73ebfae8..dc41cbf64b1e 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.79 2008/01/29 08:53:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.80 2008/01/29 22:00:24 dev-zero Exp $
+
+  29 Jan 2008; Tiziano Müller <dev-zero@gentoo.org> evms-2.5.5-r10.ebuild:
+  Added conditional pkg-config dependencies for USE-flags gtk and ncurses (bug
+  #204707), moved patches into tarball.
 
   29 Jan 2008; Tiziano Müller <dev-zero@gentoo.org> evms-2.5.5-r10.ebuild:
   Added conditional pkg-config dependencies for USE-flags gtk and ncurses (bug
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index c0321f62dd6b..0f79e91b9f00 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -87,10 +87,11 @@ MD5 be9a8d57ec7c718e34a5841012d91d62 files/evms2-start.sh 384
 RMD160 ab9713e9ad046c22b069229f1b99c338c1f01f21 files/evms2-start.sh 384
 SHA256 993d7ca52936780698f46bc9fc148c326db545986baee4b0f9786264d905cb5a files/evms2-start.sh 384
 DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
-EBUILD evms-2.5.5-r10.ebuild 5933 RMD160 878e70ff5e333c53113b8a501015071b02c602e2 SHA1 d7252dfd9e7fe48217e94405719c367a2183d25e SHA256 3b8210fdd50e4262d43b0898d3f1b1a84c8aa27a2f6bc1452b20dc439d29b192
-MD5 6102663a61263f7c3957027803f81584 evms-2.5.5-r10.ebuild 5933
-RMD160 878e70ff5e333c53113b8a501015071b02c602e2 evms-2.5.5-r10.ebuild 5933
-SHA256 3b8210fdd50e4262d43b0898d3f1b1a84c8aa27a2f6bc1452b20dc439d29b192 evms-2.5.5-r10.ebuild 5933
+DIST evms-patches-2.5.5-1.tbz2 8191 RMD160 81065940081001de0d8bff7b286679436bf4192a SHA1 7ca94a59fe53001ea7f51d92d1f4d4f4c306fcce SHA256 1c0bd06e44782ac1175e9ed091d0cb0ea88c07b004d3d0f353edc849da173bd8
+EBUILD evms-2.5.5-r10.ebuild 5308 RMD160 87015c03930dec6f230e7b6d5877284423e0ea0c SHA1 3067aa63f3fce62105fb16df30895c6566faaed3 SHA256 e10c007de96af77e7e68b4db8cd2408b632f7adab727609b7ee5d253c7b1e43d
+MD5 d900789ad55b971c2ccfe100497a128a evms-2.5.5-r10.ebuild 5308
+RMD160 87015c03930dec6f230e7b6d5877284423e0ea0c evms-2.5.5-r10.ebuild 5308
+SHA256 e10c007de96af77e7e68b4db8cd2408b632f7adab727609b7ee5d253c7b1e43d evms-2.5.5-r10.ebuild 5308
 EBUILD evms-2.5.5-r5.ebuild 4892 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 SHA1 cd0fb789199199050b320debcb53f2cbc4f693b9 SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82
 MD5 a0b777cc181e4b21c770511f5ac4ce04 evms-2.5.5-r5.ebuild 4892
 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 evms-2.5.5-r5.ebuild 4892
@@ -107,17 +108,17 @@ EBUILD evms-2.5.5-r9.ebuild 5523 RMD160 f194583819705d65e57d76d6b371268bd88e8cea
 MD5 82acaa756d56693b0853b0a68835b451 evms-2.5.5-r9.ebuild 5523
 RMD160 f194583819705d65e57d76d6b371268bd88e8cea evms-2.5.5-r9.ebuild 5523
 SHA256 1853dc06d667577ab269c337e01e45099980051d4debe6b88c70c2fca9bbcac7 evms-2.5.5-r9.ebuild 5523
-MISC ChangeLog 16282 RMD160 793b903e464748e1ab21dc8fefb2979509a4f17f SHA1 68d29a1990d32404852ebdd30d72a073407e8162 SHA256 5071324c00b2542d2aabdfddf6490a9d2893fece122d5ad1498df746c90a5c6a
-MD5 0d380b54cbfc9c41ad9f5a71596c2de6 ChangeLog 16282
-RMD160 793b903e464748e1ab21dc8fefb2979509a4f17f ChangeLog 16282
-SHA256 5071324c00b2542d2aabdfddf6490a9d2893fece122d5ad1498df746c90a5c6a ChangeLog 16282
+MISC ChangeLog 16478 RMD160 4c5041cfbf36fddd633214ed6f544af7a32e25c2 SHA1 51e05d04a782e3486b33e73a12d82775da8c927a SHA256 d60a5ac46aebff53137b61f36814e90f0fcc70927e25122f05c030e0c15c4f1c
+MD5 bca970b2618ee4422b939f848f8c3cbd ChangeLog 16478
+RMD160 4c5041cfbf36fddd633214ed6f544af7a32e25c2 ChangeLog 16478
+SHA256 d60a5ac46aebff53137b61f36814e90f0fcc70927e25122f05c030e0c15c4f1c ChangeLog 16478
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata.xml 383
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r10 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r10 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r10 235
+MD5 9e93830680f703476f788039a4c9c30a files/digest-evms-2.5.5-r10 485
+RMD160 6c52a1517a1373885efd8827fa19454134f556b5 files/digest-evms-2.5.5-r10 485
+SHA256 44e30c9a5e9c36f2d4ccd901f555440b27cf7bd85e1e1702cb8a3b4bf68c6566 files/digest-evms-2.5.5-r10 485
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r5 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r5 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r5 235
diff --git a/sys-fs/evms/evms-2.5.5-r10.ebuild b/sys-fs/evms/evms-2.5.5-r10.ebuild
index 243ce0bf7dd3..ac097962fa9c 100644
--- a/sys-fs/evms/evms-2.5.5-r10.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r10.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.2 2008/01/29 08:53:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.3 2008/01/29 22:00:24 dev-zero Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
 inherit eutils flag-o-matic multilib toolchain-funcs autotools linux-info
 
+PATCHVER="${PV}-1"
+
 DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-patches-${PATCHVER}.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -54,26 +57,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch \
-		"${FILESDIR}/${PV}/md_super_fix.patch" \
-		"${FILESDIR}/${PV}/ntfs_unmkfs.patch" \
-		"${FILESDIR}/${PV}/raid5_degrade_fix_v2.patch" \
-		"${FILESDIR}/${PV}/raid5_remove_spare_fix.patch" \
-		"${FILESDIR}/${PV}/raid5_remove_spare_fix_2.patch" \
-		"${FILESDIR}/${PV}/raid5_algorithm.patch" \
-		"${FILESDIR}/${PV}/cli_reload_options.patch" \
-		"${FILESDIR}/${PV}/cli_query_segfault.patch" \
-		"${FILESDIR}/${PV}/get_geometry.patch" \
-		"${FILESDIR}/${PV}/BaseName.patch" \
-		"${FILESDIR}/${PV}/disk_cache.patch"
-
-	epatch \
-		"${FILESDIR}/${P}-as-needed.patch" \
-		"${FILESDIR}/${P}-glib_dep.patch" \
-		"${FILESDIR}/${P}-ocfs2.patch" \
-		"${FILESDIR}/${P}-use_disk_group.patch" \
-		"${FILESDIR}/${P}-pagesize.patch" \
-		"${FILESDIR}/${P}-snapshot.patch"
+	EPATCH_SOURCE="${WORKDIR}/patches"
+	EPATCH_SUFFIX="patch"
+	epatch
 
 	eautoreconf
 }
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r10 b/sys-fs/evms/files/digest-evms-2.5.5-r10
index 33b12c6760ce..f86986c4563d 100644
--- a/sys-fs/evms/files/digest-evms-2.5.5-r10
+++ b/sys-fs/evms/files/digest-evms-2.5.5-r10
@@ -1,3 +1,6 @@
 MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321
 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321
 SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321
+MD5 55ee10e5242e9f2d47ee39220b8c84fb evms-patches-2.5.5-1.tbz2 8191
+RMD160 81065940081001de0d8bff7b286679436bf4192a evms-patches-2.5.5-1.tbz2 8191
+SHA256 1c0bd06e44782ac1175e9ed091d0cb0ea88c07b004d3d0f353edc849da173bd8 evms-patches-2.5.5-1.tbz2 8191