Version bump, relaxed dependencies.

(Portage version: 2.1.2-r9)

6 files changed, 59 insertions, 40 deletions

diff --git a/sys-cluster/gfs-headers/ChangeLog b/sys-cluster/gfs-headers/ChangeLog
index 698b1f835c14..bcff9e456afa 100644
--- a/sys-cluster/gfs-headers/ChangeLog
+++ b/sys-cluster/gfs-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/gfs-headers
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/ChangeLog,v 1.13 2006/10/14 18:10:15 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/ChangeLog,v 1.14 2007/03/09 10:52:00 xmerlin Exp $
+
+*gfs-headers-1.04.00 (09 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  gfs-headers-1.02.00-r1.ebuild, gfs-headers-1.03.00.ebuild,
+  +gfs-headers-1.04.00.ebuild:
+  Version bump, relaxed dependencies.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   -gfs-headers-1.01.00.ebuild, -gfs-headers-1.02.00.ebuild:
diff --git a/sys-cluster/gfs-headers/files/digest-gfs-headers-1.02.00-r1 b/sys-cluster/gfs-headers/files/digest-gfs-headers-1.02.00-r1
index 7b137a3e5d96..19b3b6264115 100644
--- a/sys-cluster/gfs-headers/files/digest-gfs-headers-1.02.00-r1
+++ b/sys-cluster/gfs-headers/files/digest-gfs-headers-1.02.00-r1
@@ -1,9 +1,3 @@
 MD5 131c34c8b66d8d7d74384839ed4091d0 cluster-1.02.00.tar.gz 1356451
 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 cluster-1.02.00.tar.gz 1356451
 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 cluster-1.02.00.tar.gz 1356451
-MD5 67c38ef215cfccbafbfcd7d8e40867b4 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
-RMD160 9cd7c3df465a1c85fc59a57ee601f4b6b589284f gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
-SHA256 39fb40d83cd4547a45ef00c11714392a7cc15b968b5c7aa05fd96eb63d9c7196 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
-MD5 916c21631d512bda65fcbdc43bcba1b5 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
-RMD160 bc10691dbdd4afb6d8fa8618f3b42d54792fb3bf gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
-SHA256 7a6a7b531f9cd73a3b2ab46849372862d1903a9a0d879544ef60599762ad9ff6 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
diff --git a/sys-cluster/gfs-headers/files/digest-gfs-headers-1.04.00 b/sys-cluster/gfs-headers/files/digest-gfs-headers-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/gfs-headers/files/digest-gfs-headers-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild b/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild
index c0f9e2b0e5f4..1ac8f68a4443 100644
--- a/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild
+++ b/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild
@@ -1,20 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild,v 1.4 2006/08/24 18:49:04 xmerlin Exp $
-
-inherit eutils linux-info
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/gfs-headers-1.02.00-r1.ebuild,v 1.5 2007/03/09 10:52:00 xmerlin Exp $
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060714"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="GFS headers"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,25 +16,11 @@ KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
-DEPEND=">=sys-cluster/dlm-headers-1.02.00-r1
-	>=sys-cluster/cman-headers-1.02.00-r1"
-
+DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part1.patch || die
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -gt "16" ] ; then
-			epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part2.patch || die
-		fi
-	fi
-}
-
 src_compile() {
 	einfo "No compilation necessary"
 }
diff --git a/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild b/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild
index 8af351f7c22a..58890bf91e60 100644
--- a/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild
+++ b/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild,v 1.1 2006/08/30 13:10:25 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/gfs-headers-1.03.00.ebuild,v 1.2 2007/03/09 10:52:00 xmerlin Exp $
+
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
-MY_P="cluster-${PV}"
 
 DESCRIPTION="GFS headers"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,9 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-DEPEND=">=sys-cluster/dlm-headers-1.03.00
-	>=sys-cluster/cman-headers-1.03.00"
-
+DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
diff --git a/sys-cluster/gfs-headers/gfs-headers-1.04.00.ebuild b/sys-cluster/gfs-headers/gfs-headers-1.04.00.ebuild
new file mode 100644
index 000000000000..d84ec8fc5362
--- /dev/null
+++ b/sys-cluster/gfs-headers/gfs-headers-1.04.00.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-headers/gfs-headers-1.04.00.ebuild,v 1.1 2007/03/09 10:52:00 xmerlin Exp $
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+
+DESCRIPTION="GFS headers"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN/headers/kernel}"
+
+src_compile() {
+	einfo "No compilation necessary"
+}
+
+src_install() {
+	dodir /usr/include/linux || die
+	insinto /usr/include/linux
+	insopts -m0644
+	doins src/harness/lm_interface.h || die
+	doins src/gfs/gfs_ondisk.h || die
+	doins src/gfs/gfs_ioctl.h || die
+}