Ebuild cleanup, version bump.

(Portage version: 2.1.4.4)

7 files changed, 36 insertions, 182 deletions

diff --git a/sys-cluster/ccs/ChangeLog b/sys-cluster/ccs/ChangeLog
index 529d566bd3dc..b63182ddd0c2 100644
--- a/sys-cluster/ccs/ChangeLog
+++ b/sys-cluster/ccs/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-cluster/ccs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.38 2008/03/23 16:07:33 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.39 2008/11/13 18:58:35 xmerlin Exp $
+
+*ccs-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -ccs-1.02.00-r1.ebuild, -ccs-1.03.00.ebuild, -ccs-1.04.00.ebuild,
+  -ccs-2.02.00.ebuild, -ccs-2.02.00-r1.ebuild, +ccs-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
+
+*ccs-2.03.07 (18 Aug 2008)
+
+  18 Aug 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -ccs-1.02.00-r1.ebuild, -ccs-1.03.00.ebuild, -ccs-1.04.00.ebuild,
+  +ccs-2.03.07.ebuild:
+  Version bump, ebuild cleanup.
 
 *ccs-2.02.00-r1 (23 Mar 2008)
 
diff --git a/sys-cluster/ccs/ccs-1.02.00-r1.ebuild b/sys-cluster/ccs/ccs-1.02.00-r1.ebuild
deleted file mode 100644
index 98497208b733..000000000000
--- a/sys-cluster/ccs/ccs-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.02.00-r1.ebuild,v 1.7 2008/03/17 16:31:39 xmerlin Exp $
-
-inherit eutils
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060713"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
-
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
-}
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-1.03.00.ebuild b/sys-cluster/ccs/ccs-1.03.00.ebuild
deleted file mode 100644
index 68043dcde005..000000000000
--- a/sys-cluster/ccs/ccs-1.03.00.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.03.00.ebuild,v 1.6 2008/03/17 16:31:39 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-1.04.00.ebuild b/sys-cluster/ccs/ccs-1.04.00.ebuild
deleted file mode 100644
index 29e4d885179c..000000000000
--- a/sys-cluster/ccs/ccs-1.04.00.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.04.00.ebuild,v 1.2 2008/03/17 16:31:39 xmerlin Exp $
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-DEPEND="=sys-cluster/magma-${CLUSTER_RELEASE}*
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	./configure || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}d.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
-}
diff --git a/sys-cluster/ccs/ccs-2.02.00-r1.ebuild b/sys-cluster/ccs/ccs-2.02.00-r1.ebuild
deleted file mode 100644
index 4aa1f8505087..000000000000
--- a/sys-cluster/ccs/ccs-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:07:33 xmerlin Exp $
-
-inherit eutils versionator
-
-CVS_RELEASE="20080323"
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	#rm -f "${S}"/lib/log.c || die
-
-	emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/ccs/ccs-2.02.00.ebuild b/sys-cluster/ccs/ccs-2.03.09.ebuild
index 4a023fa33c21..fd159c747eae 100644
--- a/sys-cluster/ccs/ccs-2.02.00.ebuild
+++ b/sys-cluster/ccs/ccs-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.02.00.ebuild,v 1.1 2008/03/17 16:31:39 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-2.03.09.ebuild,v 1.1 2008/11/13 18:58:35 xmerlin Exp $
 
 inherit eutils versionator
 
@@ -26,14 +26,21 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/ccs-2.03.09-mkostemp.patch || die
+}
+
 src_compile() {
 	(cd "${WORKDIR}"/${MY_P};
 		./configure \
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
diff --git a/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch b/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
new file mode 100644
index 000000000000..42e2de6ac4ff
--- /dev/null
+++ b/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
@@ -0,0 +1,11 @@
+--- cluster-2.03.09/ccs/ccs_tool/upgrade.c.orig	2008-11-13 01:31:14.000000000 +0100
++++ cluster-2.03.09/ccs/ccs_tool/upgrade.c	2008-11-13 01:31:34.000000000 +0100
+@@ -223,7 +223,7 @@
+   memset(tmp_file, 0, 128);
+   sprintf(tmp_file, "/tmp/ccs_tool_tmp_XXXXXX");
+ 
+-  tmp_fd = mkostemp(tmp_file, O_RDWR | O_CREAT |O_TRUNC);
++  tmp_fd = mkstemp(tmp_file);
+   if(tmp_fd < 0){
+     fprintf(stderr, "Unable to create temporary archive: %s\n", strerror(errno));
+     error = -errno;