Version bump, ebuild cleanup.

Package-Manager: portage-2.1.1-r2

4 files changed, 126 insertions, 1 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 5a08194428d5..a11d3736b766 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,17 @@
 # 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.59 2007/02/05 00:12:11 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.60 2007/02/05 00:36:23 xmerlin Exp $
+
+*drbd-8.0.0 (05 Feb 2007)
+
+  05 Feb 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/0.6.12-Makefile.vars.patch, -files/0.6.12-init,
+  -files/0.6.12-conf.d, -files/0.6.12-module-Makefile.patch,
+  -files/0.6.12-scripts-Makefile.patch,
+  +files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch,
+  -drbd-0.7.21.ebuild, -drbd-8.0_pre5.ebuild, -drbd-8.0_pre6.ebuild,
+  +drbd-8.0.0.ebuild:
+  Version bump, ebuild cleanup.
 
 *drbd-0.7.23 (05 Feb 2007)
 *drbd-0.7.22-r1 (05 Feb 2007)
diff --git a/sys-cluster/drbd/drbd-8.0.0.ebuild b/sys-cluster/drbd/drbd-8.0.0.ebuild
new file mode 100644
index 000000000000..437bc53992e4
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.0.0.ebuild
@@ -0,0 +1,88 @@
+# 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-8.0.0.ebuild,v 1.1 2007/02/05 00:36:23 xmerlin Exp $
+
+inherit eutils versionator linux-mod linux-info
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~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="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-8.0.0-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 and"
+	einfo "CONFIG_CONNECTOR must be enabled"
+	einfo "If otherwise -> build will fail."
+	einfo ""
+
+	if kernel_is 2 6; then
+		emake KDIR=${KERNEL_DIR} || die "compile problem"
+	else
+		cp -R /usr/src/linux-${KV} ${WORKDIR}
+		emake KDIR=/${WORKDIR}/linux-${KV} || 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 ROADMAP INSTALL
+	#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*.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 "man 8 drbddisk"
+	einfo "man 8 drbdmeta"
+	einfo ""
+}
diff --git a/sys-cluster/drbd/files/digest-drbd-8.0.0 b/sys-cluster/drbd/files/digest-drbd-8.0.0
new file mode 100644
index 000000000000..4600b3987438
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-8.0.0
@@ -0,0 +1,3 @@
+MD5 ead0c43fc8c4fcc367a5c736272493d8 drbd-8.0.0.tar.gz 460800
+RMD160 9060e90404e7bcb668d1f276e437d99332a379db drbd-8.0.0.tar.gz 460800
+SHA256 ad39d4649262850df39ecb75c52a85625a34e09b664ef921b2219a8c240e5b49 drbd-8.0.0.tar.gz 460800
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
new file mode 100644
index 000000000000..beb07fbdaeb9
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-8.0.0-scripts.adjust_drbd_config_h.sh.patch
@@ -0,0 +1,23 @@
+--- 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 \