DRDB package splitted in drbd + drbd-kernel, conversion to linux-mod, drbd-0.7.24 is scheduled to be removed.

Package-Manager: portage-2.1.3.9

7 files changed, 32 insertions, 95 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 631d491d72f0..1bd74dbad43b 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.73 2007/09/20 08:35:22 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.74 2007/10/05 14:02:51 xmerlin Exp $
+
+*drbd-8.0.6-r1 (05 Oct 2007)
+*drbd-0.7.24-r1 (05 Oct 2007)
+
+  05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  +drbd-0.7.24-r1.ebuild, -drbd-8.0.5.ebuild, -drbd-8.0.6.ebuild,
+  +drbd-8.0.6-r1.ebuild:
+  DRDB package splitted in drbd + drbd-kernel, conversion to linux-mod.
+  drbd-0.7.24 is scheduled to be removed.
 
 *drbd-8.0.6 (10 Sep 2007)
 
diff --git a/sys-cluster/drbd/drbd-8.0.6.ebuild b/sys-cluster/drbd/drbd-0.7.24-r1.ebuild
index 079ec060df81..8ba2f8996f9e 100644
--- a/sys-cluster/drbd/drbd-8.0.6.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-8.0.6.ebuild,v 1.1 2007/09/20 08:35:22 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24-r1.ebuild,v 1.1 2007/10/05 14:02:51 xmerlin Exp $
 
-inherit eutils versionator linux-mod linux-info
+inherit eutils versionator
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 MY_PV="${PV/_/}"
 MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
@@ -15,63 +15,40 @@ HOMEPAGE="http://www.drbd.org"
 
 IUSE=""
 
-DEPEND="virtual/linux-sources"
+DEPEND=""
 RDEPEND=""
+PDEPEND="~sys-cluster/drbd-kernel-${PV}"
+
 SLOT="0"
-CONFIG_CHECK="CONNECTOR"
 
 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
-
-	linux_chkconfig_present
-
-	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
+	emake -j1 tools || die "compile problem"
 }
 
 src_install() {
-	emake PREFIX=${D} install || die "install problem"
+	emake PREFIX=${D} install-tools || die "install problem"
 
 	# gentoo-ish init-script
-	newinitd ${FILESDIR}/${PN}-8.0.rc ${PN} || die
+	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
+	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*.txt || 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"
diff --git a/sys-cluster/drbd/drbd-8.0.5.ebuild b/sys-cluster/drbd/drbd-8.0.6-r1.ebuild
index 069a2cc77574..4fb21b2db099 100644
--- a/sys-cluster/drbd/drbd-8.0.5.ebuild
+++ b/sys-cluster/drbd/drbd-8.0.6-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.5.ebuild,v 1.2 2007/08/16 16:34:22 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.0.6-r1.ebuild,v 1.1 2007/10/05 14:02:51 xmerlin Exp $
 
-inherit eutils versionator linux-mod linux-info
+inherit eutils versionator
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -15,63 +15,35 @@ HOMEPAGE="http://www.drbd.org"
 
 IUSE=""
 
-DEPEND="virtual/linux-sources"
+DEPEND=""
 RDEPEND=""
+PDEPEND="~sys-cluster/drbd-kernel-${PV}"
+
 SLOT="0"
-CONFIG_CHECK="CONNECTOR"
 
 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
-
-	linux_chkconfig_present
-
-	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
+	emake -j1 tools || die "compile problem"
 }
 
 src_install() {
-	emake PREFIX=${D} install || die "install problem"
+	emake PREFIX=${D} install-tools || die "install problem"
 
 	# gentoo-ish init-script
 	newinitd ${FILESDIR}/${PN}-8.0.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"
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.24-r1 b/sys-cluster/drbd/files/digest-drbd-0.7.24-r1
new file mode 100644
index 000000000000..a3e1dde9a2c6
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.7.24-r1
@@ -0,0 +1,3 @@
+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-8.0.5 b/sys-cluster/drbd/files/digest-drbd-8.0.5
deleted file mode 100644
index 12defa62dbb4..000000000000
--- a/sys-cluster/drbd/files/digest-drbd-8.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b5463772f1749e86c8c29e56b0e9938b drbd-8.0.5.tar.gz 489834
-RMD160 dfb4ceb8b1ed4364d49f1fb323ffe70fe6725121 drbd-8.0.5.tar.gz 489834
-SHA256 162e7994968c15235a7ae7a8bc53276fc8b4d4485c6a72716b0f83feda2e63ad drbd-8.0.5.tar.gz 489834
diff --git a/sys-cluster/drbd/files/digest-drbd-8.0.6 b/sys-cluster/drbd/files/digest-drbd-8.0.6-r1
index 490d2a638f64..490d2a638f64 100644
--- a/sys-cluster/drbd/files/digest-drbd-8.0.6
+++ b/sys-cluster/drbd/files/digest-drbd-8.0.6-r1
diff --git a/sys-cluster/drbd/files/drbd-0.7-module-Makefile.patch b/sys-cluster/drbd/files/drbd-0.7-module-Makefile.patch
deleted file mode 100644
index ebb5a6695376..000000000000
--- a/sys-cluster/drbd/files/drbd-0.7-module-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- drbd-0.7.6/drbd/Makefile.chris	2004-12-15 06:26:37.977601576 +0100
-+++ drbd-0.7.6/drbd/Makefile	2004-12-15 06:27:02.997797928 +0100
-@@ -154,12 +154,12 @@
- # install -d $(PREFIX)/var/lib/drbd
- 	install -d $(PREFIX)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)
- 	install -m 644 $(MODOBJ) $(PREFIX)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)
--    ifeq ($(shell uname -r),$(KERNELRELEASE))
--	/sbin/depmod -a || /sbin/depmod -e $(MODOBJ) 2>&1 >/dev/null || true
--    else
--	[ -e $(LINUX)/System.map ] && \
--	   /sbin/depmod -F $(LINUX)/System.map -e ./$(MODOBJ) 2>&1 >/dev/null || true
--    endif
-+#    ifeq ($(shell uname -r),$(KERNELRELEASE))
-+#	/sbin/depmod -a || /sbin/depmod -e $(MODOBJ) 2>&1 >/dev/null || true
-+#    else
-+#	[ -e $(LINUX)/System.map ] && \
-+#	   /sbin/depmod -F $(LINUX)/System.map -e ./$(MODOBJ) 2>&1 >/dev/null || true
-+#    endif
-   else
-     install:
- 	@echo "No .kernelrelease found. Do you need to 'make' the module first?"