Respect multilib paths, cleanup. Drop unused patch.

Package-Manager: portage-2.2.0_alpha10_p22/cvs/Linux x86_64

4 files changed, 57 insertions, 24 deletions

diff --git a/sys-cluster/cman-lib/ChangeLog b/sys-cluster/cman-lib/ChangeLog
index 018a79e2112b..a85f1e516432 100644
--- a/sys-cluster/cman-lib/ChangeLog
+++ b/sys-cluster/cman-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/cman-lib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/ChangeLog,v 1.7 2010/10/20 12:34:52 cla Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/ChangeLog,v 1.8 2011/01/20 11:00:37 xarthisius Exp $
+
+*cman-lib-2.03.09-r1 (20 Jan 2011)
+
+  20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/cman-lib-2.02.00-include.patch, +cman-lib-2.03.09-r1.ebuild:
+  Respect multilib paths, cleanup. Drop unused patch.
 
   20 Oct 2010; Dawid Węgliński <cla@gentoo.org> cman-lib-2.03.09.ebuild:
   Respect LDFLAGS (#337652)
diff --git a/sys-cluster/cman-lib/Manifest b/sys-cluster/cman-lib/Manifest
index 130ca85ac8e0..8ae0374d6530 100644
--- a/sys-cluster/cman-lib/Manifest
+++ b/sys-cluster/cman-lib/Manifest
@@ -1,5 +1,5 @@
-AUX cman-lib-2.02.00-include.patch 458 RMD160 950181252a82b01050101451d3880fdba448e4cb SHA1 f801463bc66dbe8c1c6e623cd29de22829994c7e SHA256 ee133373a88e6bfe03504d9745124f8642407f911dd2efe7299d1bb096159324
 DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
+EBUILD cman-lib-2.03.09-r1.ebuild 1228 RMD160 372055bf20fd9a9ad7eff0ffb8d10bf8436da0d6 SHA1 eef750e31d31d4ef1d4ba4741821245fb4525308 SHA256 b9e39368e1c8221944f5f1ec17746915fd17cf8785ed900b44a0774d3a2055da
 EBUILD cman-lib-2.03.09.ebuild 1310 RMD160 41ce7af0518e724cfa6b0ac398cbbe2286ffb8b8 SHA1 8e4e10e24ea89114bb9fc2baf808d4d84ff9899c SHA256 066cb94fa37403af717c437bb6ce3ef9932cfda0364cff8a784b823e7e09ca8d
-MISC ChangeLog 1270 RMD160 53770818aafb93337d86a510f2de7b20344de1d0 SHA1 2805d5bace398dec57cb43e95a205a988c48dcfe SHA256 ff0b625bb41d3afc6ada824138beca0707c189c8645493892c88740405b400a3
+MISC ChangeLog 1492 RMD160 0e5988638cdd66883c37734aca77052612a87f30 SHA1 030a10a5d4a3912acdf9301aa1492140eaf74b1f SHA256 0253efa134e8e5122bf3ec6f3deec2761e0c7e84850571a223df9346687f41a9
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
diff --git a/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
new file mode 100644
index 000000000000..61ea798dc8ef
--- /dev/null
+++ b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild,v 1.1 2011/01/20 11:00:37 xarthisius Exp $
+
+inherit eutils versionator multilib
+
+MY_P=cluster-${PV}
+
+MAJ_PV=$(get_major_version)
+MIN_PV=$(get_version_component_range 2).$(get_version_component_range 3)
+
+DESCRIPTION="A library for cluster management common to the various pieces of Cluster Suite."
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!sys-cluster/cman-headers
+	!sys-cluster/cman-kernel
+	!=sys-cluster/cman-1*"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN/-//}
+
+src_compile() {
+	(cd "${WORKDIR}"/${MY_P};
+		./configure \
+			--cc="$(tc-getCC)" \
+			--libdir=/usr/$(get_libdir) \
+			--cflags="-Wall" \
+			--disable_kernel_check \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
+	) || die "configure problem"
+
+	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' \
+		-i Makefile "${WORKDIR}/${MY_P}/make/cobj.mk" || die
+
+	emake clean all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/sys-cluster/cman-lib/files/cman-lib-2.02.00-include.patch b/sys-cluster/cman-lib/files/cman-lib-2.02.00-include.patch
deleted file mode 100644
index 9dc8de388904..000000000000
--- a/sys-cluster/cman-lib/files/cman-lib-2.02.00-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cluster-2.02.00/cman/lib/Makefile.orig	2008-02-26 15:37:43.000000000 +0000
-+++ cluster-2.02.00/cman/lib/Makefile	2008-03-16 15:08:59.000000000 +0000
-@@ -13,6 +13,8 @@
- 
- TARGET= libcman
- 
-+include ../../make/defines.mk
-+
- LIBDIRT=$(TARGET).a \
- 	$(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
- 
-@@ -21,8 +23,6 @@
- 
- INCDIRT=$(TARGET).h
- 
--include ../../make/defines.mk
--
- SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
- STATICLIB=$(TARGET).a
-