16 files changed, 37 insertions, 138 deletions
diff --git a/sys-cluster/ccs/ChangeLog b/sys-cluster/ccs/ChangeLog
index 2b7a1a04d1bc..6ad6a67cace6 100644
--- a/sys-cluster/ccs/ChangeLog
+++ b/sys-cluster/ccs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ccs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.13 2005/03/25 16:25:14 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ChangeLog,v 1.14 2005/06/30 12:41:15 xmerlin Exp $
+
+*ccs-1.00.00 (30 Jun 2005)
+
+  30 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> -ccs-0.24.ebuild,
+  -ccs-0.7.ebuild, +ccs-1.00.00.ebuild:
+  1.00.00 tree in portage. Removed old ebuilds.
 
   25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> ccs-0.24.ebuild:
   fixed init/conf name
diff --git a/sys-cluster/ccs/Manifest b/sys-cluster/ccs/Manifest
index 43648c180cb9..470b77e8feb3 100644
--- a/sys-cluster/ccs/Manifest
+++ b/sys-cluster/ccs/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 MD5 9fa91c22c5dcbf38ca7417f83cfb5c3f ccs-0.7.ebuild 748
 MD5 90845748516ce8abb1ee3e4e69e2e872 ccs-0.24.ebuild 864
 MD5 411bca74221073e395d0c1b15c44a2d5 ChangeLog 1435
+MD5 d678bb5fb4af3d15551406efe1f3a78a ccs-1.00.00.ebuild 849
 MD5 26c41799e51873904b374ba950887f8b files/digest-ccs-0.7 58
 MD5 46814b5b5398bfaf0d64854a0d0900a6 files/digest-ccs-0.24 59
 MD5 8a51744fb1f2de377f819ec48a69729f files/ccsd.conf 254
 MD5 d1e8cec0a97091432dc92d7721f79442 files/ccsd.rc 522
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCRD1ogMUyd/cdjWsRAsX2AKCJnXPgWqNFdC3ItAP6vFHrNOzB+QCfeboN
-5B8H9sjLSuSqO9JJT5ai6VM=
-=Lp0T
------END PGP SIGNATURE-----
+MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-ccs-1.00.00 68
diff --git a/sys-cluster/ccs/ccs-0.24.ebuild b/sys-cluster/ccs/ccs-0.24.ebuild
deleted file mode 100644
index 9f6325c1fed5..000000000000
--- a/sys-cluster/ccs/ccs-0.24.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-0.24.ebuild,v 1.4 2005/03/25 16:25:14 xmerlin Exp $
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${P}.tar.gz"
-
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-cluster/magma-1.0_pre8
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-src_compile() {
-	./configure || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	newinitd ${FILESDIR}/${PN}d.rc ${PN}d || die
-	newconfd ${FILESDIR}/${PN}d.conf ${PN}d || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Probably you need also the magma-plugins package in your cluster!"
-	einfo ""
-}
diff --git a/sys-cluster/ccs/ccs-0.7.ebuild b/sys-cluster/ccs/ccs-1.00.00.ebuild
index 5d60a9886a4e..2a511ed7a434 100644
--- a/sys-cluster/ccs/ccs-0.7.ebuild
+++ b/sys-cluster/ccs/ccs-1.00.00.ebuild
@@ -1,24 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-0.7.ebuild,v 1.5 2005/03/07 15:52:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ccs/ccs-1.00.00.ebuild,v 1.1 2005/06/30 12:41:15 xmerlin Exp $
 
 inherit linux-mod
 
+CLUSTER_VERSION="1.00.00"
 DESCRIPTION="cluster configuration system to manage the cluster config file"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${P}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
 IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-DEPEND=">=sys-cluster/magma-1.0_pre3
+DEPEND=">=sys-cluster/magma-1.00.00
 	dev-libs/libxml2
 	sys-libs/zlib"
 
-RDEPEND="${DEPEND}
-	>=sys-cluster/magma-plugins-1.0_pre5"
+RDEPEND=">=sys-cluster/magma-1.00.00
+	dev-libs/libxml2
+	sys-libs/zlib
+	>=sys-cluster/magma-plugins-1.00.00"
+
+
+S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
 
 src_compile() {
 	check_KV
diff --git a/sys-cluster/ccs/files/digest-ccs-0.24 b/sys-cluster/ccs/files/digest-ccs-0.24
deleted file mode 100644
index 518c91386a15..000000000000
--- a/sys-cluster/ccs/files/digest-ccs-0.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76f95eb0ba7bc35ae9d7c40be6eb3fe5 ccs-0.24.tar.gz 43603
diff --git a/sys-cluster/ccs/files/digest-ccs-0.7 b/sys-cluster/ccs/files/digest-ccs-0.7
deleted file mode 100644
index e8591f49b133..000000000000
--- a/sys-cluster/ccs/files/digest-ccs-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a653f4dd102bd8807cc1f12b063cc4e ccs-0.7.tar.gz 29360
diff --git a/sys-cluster/ccs/files/digest-ccs-1.00.00 b/sys-cluster/ccs/files/digest-ccs-1.00.00
new file mode 100644
index 000000000000..7b0e114fb607
--- /dev/null
+++ b/sys-cluster/ccs/files/digest-ccs-1.00.00
@@ -0,0 +1 @@
+MD5 49548be2d01d007e8e74d801a8a98f37 cluster-1.00.00.tar.gz 1329114
diff --git a/sys-cluster/magma/ChangeLog b/sys-cluster/magma/ChangeLog
index fafdeeb88cc3..5f18b6b0b58b 100644
--- a/sys-cluster/magma/ChangeLog
+++ b/sys-cluster/magma/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/magma
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma/ChangeLog,v 1.4 2005/03/23 02:46:23 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma/ChangeLog,v 1.5 2005/06/30 12:39:32 xmerlin Exp $
+
+*magma-1.00.00 (30 Jun 2005)
+
+  30 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/magma-1.0_pre21-compile.patch, -files/magma-1.0_pre3-compile.patch,
+  +magma-1.00.00.ebuild, -magma-1.0_pre21.ebuild, -magma-1.0_pre3.ebuild:
+  1.00.00 tree in portage. Removed old ebuilds.
 
   23 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> magma-1.0_pre21.ebuild,
   -magma-1.0_pre8.ebuild:
diff --git a/sys-cluster/magma/Manifest b/sys-cluster/magma/Manifest
index 25bfd1fe2878..a60f1a69fa7d 100644
--- a/sys-cluster/magma/Manifest
+++ b/sys-cluster/magma/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fec75bc07eb9dd6eb1b7482ef9d70765 magma-1.0_pre3.ebuild 899
 MD5 4421e1ea27829d2319a718c40870d9cc ChangeLog 759
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 64671a75fb72fc1f238d5cae051ffd30 magma-1.0_pre21.ebuild 832
-MD5 aaf4c7bccd121c5115be3d1d555ce57a files/digest-magma-1.0_pre3 65
+MD5 ba357ffa7907c1bebbf27f136a3916e1 magma-1.00.00.ebuild 770
 MD5 45d407b7e9059b58bd3872a1bc51e45f files/magma-1.0_pre3-compile.patch 360
-MD5 1c8a8e753e33910ac87f4530d356b115 files/digest-magma-1.0_pre21 66
 MD5 bde1a3de41f098b1c3968bb405b83aab files/magma-1.0_pre21-compile.patch 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQNyagMUyd/cdjWsRAtZ0AJ9L1qcptkkUOEvluuCpZkZeVYR/1gCeI87X
-vBYeoxavaRvTlJTYBP7AfpY=
-=A41U
------END PGP SIGNATURE-----
+MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-magma-1.00.00 68
+MD5 bde1a3de41f098b1c3968bb405b83aab files/magma-1.00.00-compile.patch 349
diff --git a/sys-cluster/magma/files/digest-magma-1.00.00 b/sys-cluster/magma/files/digest-magma-1.00.00
new file mode 100644
index 000000000000..7b0e114fb607
--- /dev/null
+++ b/sys-cluster/magma/files/digest-magma-1.00.00
@@ -0,0 +1 @@
+MD5 49548be2d01d007e8e74d801a8a98f37 cluster-1.00.00.tar.gz 1329114
diff --git a/sys-cluster/magma/files/digest-magma-1.0_pre21 b/sys-cluster/magma/files/digest-magma-1.0_pre21
deleted file mode 100644
index 3bc657620917..000000000000
--- a/sys-cluster/magma/files/digest-magma-1.0_pre21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88d9f66e4d4c0060d11809f5bca5e3dc magma-1.0-pre21.tar.gz 57418
diff --git a/sys-cluster/magma/files/digest-magma-1.0_pre3 b/sys-cluster/magma/files/digest-magma-1.0_pre3
deleted file mode 100644
index a9773f0318b2..000000000000
--- a/sys-cluster/magma/files/digest-magma-1.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06c136fe772fbb4fd8bdf6612e38374b magma-1.0-pre3.tar.gz 54634
diff --git a/sys-cluster/magma/files/magma-1.0_pre21-compile.patch b/sys-cluster/magma/files/magma-1.00.00-compile.patch
index 46efdcb35879..46efdcb35879 100644
--- a/sys-cluster/magma/files/magma-1.0_pre21-compile.patch
+++ b/sys-cluster/magma/files/magma-1.00.00-compile.patch
diff --git a/sys-cluster/magma/files/magma-1.0_pre3-compile.patch b/sys-cluster/magma/files/magma-1.0_pre3-compile.patch
deleted file mode 100644
index 95474e0a7b62..000000000000
--- a/sys-cluster/magma/files/magma-1.0_pre3-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- magma-1.0-pre3/lib/Makefile.chris	2004-10-26 18:28:03.000000000 +0000
-+++ magma-1.0-pre3/lib/Makefile	2005-01-27 09:55:27.946365688 +0000
-@@ -27,7 +27,7 @@
- 	libmagmamsg.so
- 
- INCLUDE=-I.
--CFLAGS+=-g -Werror -Wstrict-prototypes -Wshadow \
-+CFLAGS+=-g -Wall -Wstrict-prototypes -Wshadow \
- 	-fPIC -DPLUGINDIR=\"${libdir}/magma/plugins\" \
- 	-D_GNU_SOURCE
- 
diff --git a/sys-cluster/magma/magma-1.0_pre21.ebuild b/sys-cluster/magma/magma-1.00.00.ebuild
index e64167e01c8a..8a6e8007252c 100644
--- a/sys-cluster/magma/magma-1.0_pre21.ebuild
+++ b/sys-cluster/magma/magma-1.00.00.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma/magma-1.0_pre21.ebuild,v 1.2 2005/03/23 02:46:23 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma/magma-1.00.00.ebuild,v 1.1 2005/06/30 12:39:32 xmerlin Exp $
 
 inherit eutils
 
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
+CLUSTER_VERSION="1.00.00"
 
 DESCRIPTION="Magma cluster interface"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-#SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${MY_P}.tar.gz"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${MY_P}.tar.gz"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -22,7 +18,7 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/cluster-${CLUSTER_VERSION}/${PN}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-cluster/magma/magma-1.0_pre3.ebuild b/sys-cluster/magma/magma-1.0_pre3.ebuild
deleted file mode 100644
index c9032b25dba8..000000000000
--- a/sys-cluster/magma/magma-1.0_pre3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/magma/magma-1.0_pre3.ebuild,v 1.2 2005/01/27 03:30:59 xmerlin Exp $
-
-inherit eutils linux-mod
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Magma cluster interface"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-compile.patch || die
-}
-
-src_compile() {
-	check_KV
-	set_arch_to_kernel
-
-	einfo ""
-	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
-	einfo ""
-
-	./configure --kernel_src=${KERNEL_DIR} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc doc/*
-}