Version bump, 0.7.24-r1 marked stable on x86 and amd64.

Package-Manager: portage-2.1.3.9

9 files changed, 77 insertions, 138 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 3b76521ddc01..55dfba8e7f54 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.76 2007/10/05 20:55:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.77 2007/10/25 09:27:45 xmerlin Exp $
+
+*drbd-0.7.25 (25 Oct 2007)
+
+  25 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/drbd-0.7.22-nodevfs.patch,
+  -files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch,
+  -files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch,
+  -drbd-0.7.24.ebuild, drbd-0.7.24-r1.ebuild, +drbd-0.7.25.ebuild:
+  Version bump, 0.7.24-r1 marked stable on x86 and amd64.
 
   05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org> files/drbd-0.7.rc:
   Fixed bug #191231, replaced exit with return in init script.
diff --git a/sys-cluster/drbd/drbd-0.7.24-r1.ebuild b/sys-cluster/drbd/drbd-0.7.24-r1.ebuild
index 3f27540f8479..736134a287ca 100644
--- a/sys-cluster/drbd/drbd-0.7.24-r1.ebuild
+++ b/sys-cluster/drbd/drbd-0.7.24-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24-r1.ebuild,v 1.2 2007/10/05 20:34:56 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24-r1.ebuild,v 1.3 2007/10/25 09:27:45 xmerlin Exp $
 
 inherit eutils versionator
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 MY_PV="${PV/_/}"
 MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
diff --git a/sys-cluster/drbd/drbd-0.7.24.ebuild b/sys-cluster/drbd/drbd-0.7.24.ebuild
deleted file mode 100644
index 08bd55de1f67..000000000000
--- a/sys-cluster/drbd/drbd-0.7.24.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24.ebuild,v 1.5 2007/10/05 20:34:56 xmerlin Exp $
-
-inherit eutils versionator linux-mod linux-info
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.7.22-nodevfs.patch || die
-	epatch "${FILESDIR}"/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	einfo ""
-	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
-	#einfo "and match the currently running kernel version ${KV}"
-	einfo "If otherwise -> build will fail."
-	einfo ""
-
-	if kernel_is 2 6; then
-		emake -j1 KDIR="${KERNEL_DIR}" O="${KBUILD_OUTPUT}" || die "compile problem"
-	else
-		cp -R /usr/src/linux-${KV} "${WORKDIR}"
-		emake -j1 KDIR="${WORKDIR}"/linux-${KV} O="${KBUILD_OUTPUT}" || die "compile problem"
-	fi
-}
-
-src_install() {
-	emake PREFIX="${D}" install || die "install problem"
-
-	# gentoo-ish init-script
-	newinitd "${FILESDIR}"/${PN}-0.7.rc ${PN} || die
-
-	# needed by drbd startup script
-	#keepdir /var/lib/drbd
-
-	# docs
-	dodoc README ChangeLog COPYING
-	dodoc documentation/NFS-Server-README.txt
-
-	# we put drbd.conf into docs
-	# it doesnt make sense to install a default conf in /etc
-	# put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	einfo ""
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.gz to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo ""
-}
diff --git a/sys-cluster/drbd/drbd-0.7.25.ebuild b/sys-cluster/drbd/drbd-0.7.25.ebuild
new file mode 100644
index 000000000000..d3a72d3463f9
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.7.25.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.25.ebuild,v 1.1 2007/10/25 09:27:45 xmerlin Exp $
+
+inherit eutils versionator
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+MY_PV="${PV/_/}"
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+PDEPEND="~sys-cluster/drbd-kernel-${PV}"
+
+SLOT="0"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	emake -j1 tools || die "compile problem"
+}
+
+src_install() {
+	emake PREFIX="${D}" install-tools || die "install problem"
+
+	# gentoo-ish init-script
+	newinitd "${FILESDIR}"/${PN}-0.7.rc ${PN} || die
+
+	# needed by drbd startup script
+	#keepdir /var/lib/drbd
+
+	# docs
+	dodoc README ChangeLog COPYING
+	dodoc documentation/NFS-Server-README.txt
+
+	# we put drbd.conf into docs
+	# it doesnt make sense to install a default conf in /etc
+	# put it to the docs
+	rm -f "${D}"/etc/drbd.conf
+	dodoc scripts/drbd.conf || die
+	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Please copy and gunzip the configuration file"
+	einfo "from /usr/share/doc/${PF}/drbd.conf.gz to /etc"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo "man 8 drbddisk"
+	einfo "man 8 drbdmeta"
+	einfo ""
+}
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.24 b/sys-cluster/drbd/files/digest-drbd-0.7.24
deleted file mode 100644
index a3e1dde9a2c6..000000000000
--- a/sys-cluster/drbd/files/digest-drbd-0.7.24
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2c7335514a355b874a634dc12b22522 drbd-0.7.24.tar.gz 292132
-RMD160 3f8e5540e1040ec30926c1f7e114c56c499151e2 drbd-0.7.24.tar.gz 292132
-SHA256 bdeec861bdab2b9a43eda2da743f3e7fd3974126d589f853ed2b22e1f27da5e4 drbd-0.7.24.tar.gz 292132
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.25 b/sys-cluster/drbd/files/digest-drbd-0.7.25
new file mode 100644
index 000000000000..364eb131f001
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.7.25
@@ -0,0 +1,3 @@
+MD5 9db298c97306d7d0fe6d0cdbdf695cf6 drbd-0.7.25.tar.gz 287737
+RMD160 992eaf67114d027f7f2891d35e96dc939e9f60a2 drbd-0.7.25.tar.gz 287737
+SHA256 1ad7c91416026b70afc92bcbe64df16f685807f5608ff52ab52a5201935ccd6e drbd-0.7.25.tar.gz 287737
diff --git a/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch b/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch
deleted file mode 100644
index 69454ac18c7b..000000000000
--- a/sys-cluster/drbd/files/drbd-0.7.22-nodevfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- drbd-0.7.23/drbd_config.h.orig	2007-02-05 00:51:13.000000000 +0100
-+++ drbd-0.7.23/drbd_config.h	2007-02-05 00:51:18.000000000 +0100
-@@ -69,6 +69,6 @@
- // but more recent kernels define it in arch/um/include/mem.h
- #define HAVE_UML_TO_VIRT
- 
--//#define NO_MORE_DEV_FS
-+#define NO_MORE_DEV_FS
- 
- #endif
diff --git a/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch
deleted file mode 100644
index 7f0da93f24b6..000000000000
--- a/sys-cluster/drbd/files/drbd-0.7.22-scripts.adjust_drbd_config_h.sh.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- drbd-0.7.22/scripts/adjust_drbd_config_h.sh.orig	2006-10-23 10:38:57.000000000 +0200
-+++ drbd-0.7.22/scripts/adjust_drbd_config_h.sh	2007-02-05 00:58:15.000000000 +0100
-@@ -22,11 +22,7 @@
- 
- test -n "$KDIR"
- KDIR=${KDIR%/}
--if test -z "$O"; then
--	O=$KDIR;
--else
--	O=${O%/}
--fi
-+O=$KDIR;
- 
- # some paranoia: check that all files are where we expect them
- ls > /dev/null \
diff --git a/sys-cluster/drbd/files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd/files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch
deleted file mode 100644
index beb07fbdaeb9..000000000000
--- a/sys-cluster/drbd/files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- drbd-8.0.0/scripts/adjust_drbd_config_h.sh.orig	2007-02-05 01:20:58.000000000 +0100
-+++ drbd-8.0.0/scripts/adjust_drbd_config_h.sh	2007-02-05 01:21:28.000000000 +0100
-@@ -26,19 +26,7 @@
- pushd $KDIR
- 
- KDIR=${KDIR%/}
--if test -z "$O"; then
--	## just in case...
--	## detect if $KDIR points to something which is actually $O ...
--	X=$( make help | sed -ne '/ -C .* O=.* help$/p' | tr -s ' ' )
--	if [[ -n $X ]]; then
--		KDIR=${X##* -C }; KDIR=${KDIR%% *}; KDIR=$(cd $KDIR && pwd)
--		O=${X##* O=}; O=${O%% *}; O=$(cd $KDIR && cd $O && pwd)
--	else
--		O=$KDIR;
--	fi
--else
--	O=${O%/}
--fi
-+O=$KDIR;
- 
- # some paranoia: check that all files are where we expect them
- ls > /dev/null \