Fixed RDEPEND.

11 files changed, 21 insertions, 279 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index a04c5e8315a9..12a92fcfe967 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.7 2004/08/30 13:51:12 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.8 2004/09/20 20:50:52 tantive Exp $
+
+  20 Sep 2004; Michael Imhof <tantive@gentoo.org>
+  -files/0.6.6-Makefile.vars.patch, -files/0.6.6-drbd-Makefile.patch,
+  -files/0.6.6-init, -files/0.6.6-scripts-Makefile.patch,
+  drbd-0.6.12-r1.ebuild, -drbd-0.6.12.ebuild, -drbd-0.6.6-r2.ebuild:
+  Fixed RDEPEND.
+
+  19 Sep 2004; Michael Imhof <tantive@gentoo.org> drbd-0.6.12-r1.ebuild,
+  -drbd-0.6.12.ebuild, -drbd-0.6.6-r2.ebuild:
+  Cleaned out old ebuilds.
 
 *drbd-0.6.12-r1 (30 Aug 2004)
 
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 599e89bea773..e74fc8320602 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,17 +1,11 @@
-MD5 7e3f0df7e3abc647010506e9ce00c374 ChangeLog 1362
-MD5 c189b2a85daa0f46bdfa881e5b936ed0 drbd-0.6.6-r2.ebuild 1920
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 02564fab57e0c737ee7b981168b05c92 drbd-0.6.12.ebuild 2081
-MD5 93349fc4ad780d73480a898e9c24857e drbd-0.6.12-r1.ebuild 2180
-MD5 545a301fed86260ef910d0874f31bb2d files/0.6.6-Makefile.vars.patch 936
-MD5 54de4ff29f16698f6d1aa861935f7a53 files/0.6.6-drbd-Makefile.patch 816
-MD5 ce7682bc39b5263e80bea51b039e7252 files/0.6.6-init 256
-MD5 0fd7f6bf10cd5fc99f2c79c88355ea8c files/0.6.6-scripts-Makefile.patch 1008
-MD5 7fccd0c1159fb79cd60fc45ace182a56 files/digest-drbd-0.6.6-r2 62
+MD5 c85ed85148d012fd4f78aa183dfa4c11 drbd-0.7.4.ebuild 2107
+MD5 721f3ff8b63141b841740938808a2a77 ChangeLog 1509
+MD5 bbd9247c05dd4974f92c85e022421efe drbd-0.6.12-r1.ebuild 2101
 MD5 f8ceed0b6be2ded4cdb079d38ac0c3d0 files/0.6.12-Makefile.vars.patch 675
-MD5 52dc2e272f064349f8f70277159d4a5f files/0.6.12-module-Makefile.patch 776
 MD5 7416c44daab264a36cc8c5a2c35e757f files/0.6.12-scripts-Makefile.patch 1072
-MD5 3959588a14b9fba5df432a29d00fa63f files/digest-drbd-0.6.12 63
-MD5 463c9c89c7d3f156fc5581070abce14d files/0.6.12-conf.d 69
-MD5 4ab78154d6a32d13d416f9915ad4bc28 files/0.6.12-init 701
 MD5 3959588a14b9fba5df432a29d00fa63f files/digest-drbd-0.6.12-r1 63
+MD5 4ab78154d6a32d13d416f9915ad4bc28 files/0.6.12-init 701
+MD5 17287ccd598e57c8f5e2a26b6b880f10 files/digest-drbd-0.7.4 62
+MD5 463c9c89c7d3f156fc5581070abce14d files/0.6.12-conf.d 69
+MD5 52dc2e272f064349f8f70277159d4a5f files/0.6.12-module-Makefile.patch 776
diff --git a/sys-cluster/drbd/drbd-0.6.12-r1.ebuild b/sys-cluster/drbd/drbd-0.6.12-r1.ebuild
index 0b0fb8a7eafa..e3e7921811e3 100644
--- a/sys-cluster/drbd/drbd-0.6.12-r1.ebuild
+++ b/sys-cluster/drbd/drbd-0.6.12-r1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.6.12-r1.ebuild,v 1.2 2004/08/31 02:55:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.6.12-r1.ebuild,v 1.3 2004/09/20 20:50:52 tantive Exp $
 
 inherit eutils
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DESCRIPTION="mirror/replicate block-devices across a network-connection"
-#SRC_URI="http://www.linbit.com/en/filemanager/download/44/drbd-${PV}.tar.gz"
 SRC_URI="http://www.drbd.org/uploads/media/drbd-${PV}.tar.gz"
 HOMEPAGE="http://www.drbd.org"
 
 IUSE=""
 
 DEPEND="virtual/linux-sources"
-RDEPEND=">=sys-cluster/heartbeat-1.0*"
+RDEPEND=">=sys-cluster/heartbeat-1.0.4"
 SLOT="0"
 
 src_unpack() {
diff --git a/sys-cluster/drbd/drbd-0.6.12.ebuild b/sys-cluster/drbd/drbd-0.6.12.ebuild
deleted file mode 100644
index ceda1bace458..000000000000
--- a/sys-cluster/drbd/drbd-0.6.12.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.6.12.ebuild,v 1.2 2004/06/24 22:37:07 agriffis Exp $
-
-inherit eutils
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-#SRC_URI="http://www.linbit.com/en/filemanager/download/44/drbd-${PV}.tar.gz"
-SRC_URI="http://www.drbd.org/uploads/media/drbd-${PV}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND="=sys-cluster/heartbeat-1.0*"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/0.6.12-Makefile.vars.patch
-	cd drbd
-	epatch ${FILESDIR}/0.6.12-module-Makefile.patch
-	cd ..
-	cd scripts
-	epatch ${FILESDIR}/0.6.12-scripts-Makefile.patch
-	cd ${S}
-}
-
-src_compile() {
-	check_KV
-	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 ""
-	cd ${S}
-	cp -R /usr/src/linux-${KV} ${WORKDIR}
-	emake KDIR=/${WORKDIR}/linux-${KV} || die
-}
-
-src_install() {
-	cd ${S}
-	make PREFIX=${D} install
-
-	# gentoo-ish init-script
-	dodir /etc
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/0.6.12-init drbd
-
-	# needed by drbd startup script
-	dodir /var/lib/drbd
-	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
-	dodoc scripts/drbd.conf
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "upgrading module dependencies ... "
-	/sbin/depmod -a -F /lib/modules/${KV}/build/System.map
-	einfo "... done"
-	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 ""
-}
diff --git a/sys-cluster/drbd/drbd-0.6.6-r2.ebuild b/sys-cluster/drbd/drbd-0.6.6-r2.ebuild
deleted file mode 100644
index bfac21010057..000000000000
--- a/sys-cluster/drbd/drbd-0.6.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.6.6-r2.ebuild,v 1.4 2004/06/24 22:37:07 agriffis Exp $
-
-inherit eutils
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://www.linbit.com/en/filemanager/download/44/drbd-${PV}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND="=sys-kernel/vanilla-sources-2.4*"
-RDEPEND="=sys-cluster/heartbeat-1.0*"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/0.6.6-Makefile.vars.patch
-	epatch ${FILESDIR}/0.6.6-drbd-Makefile.patch
-	epatch ${FILESDIR}/0.6.6-scripts-Makefile.patch
-}
-
-src_compile() {
-	check_KV
-	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 ""
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	cd ${S}
-	make PREFIX=${D} install
-
-	# gentoo-ish init-script
-	dodir /etc
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/0.6.6-init drbd
-
-	# needed by drbd startup script
-	dodir /var/lib/drbd
-	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
-	dodoc scripts/drbd.conf
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "upgrading module dependencies ... "
-	/sbin/depmod -a -F /lib/modules/${KV}/build/System.map
-	einfo "... done"
-	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 ""
-}
diff --git a/sys-cluster/drbd/files/0.6.6-Makefile.vars.patch b/sys-cluster/drbd/files/0.6.6-Makefile.vars.patch
deleted file mode 100644
index 2672b7b1ba52..000000000000
--- a/sys-cluster/drbd/files/0.6.6-Makefile.vars.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../drbd-cvs/drbd/Makefile.vars	2003-07-28 15:02:47.000000000 +0200
-+++ Makefile.vars	2003-08-30 23:58:14.000000000 +0200
-@@ -49,7 +49,8 @@
-   $(if $(wildcard /etc/redhat-release),redhat,\
-   $(if $(wildcard /etc/slackware-version),slackware,\
-   $(if $(wildcard /etc/ROCK-VERSION),rock,\
--  $(if $(wildcard /var/lib/YaST*),suse,))))))
-+  $(if $(wildcard /var/lib/YaST*),suse,\
-+  $(if $(wildcard /etc/gentoo-release),gentoo,)))))))
- SMPFLAG         := \
-   $(shell if uname -a | grep SMP > /dev/null; then echo "-D__SMP__"; fi)
- # do we need to check against kernel .config, too?
---- ../drbd-cvs/drbd/Makefile.vars	2003-08-31 01:02:15.000000000 +0200
-+++ Makefile.vars	2003-08-31 02:15:38.000000000 +0200
-@@ -23,7 +23,7 @@
- # export all variables not explicitly _un_exported
- export
- 
--PREFIX          := /
-+#PREFIX          := /
- #DEBUGFLAGS      := -g -DDBG_ALL_SYMBOLS -DDBG_PRINTKS_RCV -DDBG_PRINTKS_SYNC
- DEBUGFLAGS      := 
- 
diff --git a/sys-cluster/drbd/files/0.6.6-drbd-Makefile.patch b/sys-cluster/drbd/files/0.6.6-drbd-Makefile.patch
deleted file mode 100644
index 312b3752715a..000000000000
--- a/sys-cluster/drbd/files/0.6.6-drbd-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../drbd-cvs/drbd/drbd/Makefile	2003-05-22 14:19:16.000000000 +0200
-+++ drbd/Makefile	2003-08-31 02:30:19.000000000 +0200
-@@ -155,12 +155,12 @@
- 	install -d $(PREFIX)lib/modules/$(KERNVER)/$(KSUBD)
- 	install -m 644 drbd.o $(PREFIX)lib/modules/$(KERNVER)/$(KSUBD)
- 	install -d $(PREFIX)var/lib/drbd
--ifeq ($(shell uname -r),$(KERNVER))
--	/sbin/depmod -a || depmod -e drbd.o 2>&1 >/dev/null || true
--else
--	[ -e $(LINUX)/System.map ] && \
--	   /sbin/depmod -F $(LINUX)/System.map -e drbd.o 2>&1 >/dev/null || true
--endif
-+#ifeq ($(shell uname -r),$(KERNVER))
-+#	/sbin/depmod -a || depmod -e drbd.o 2>&1 >/dev/null || true
-+#else
-+#	[ -e $(LINUX)/System.map ] && \
-+#	   /sbin/depmod -F $(LINUX)/System.map -e drbd.o 2>&1 >/dev/null || true
-+#endif
- 
- uninstall:
- 	rm $(PREFIX)lib/modules/$(KERNVER)/$(KSUBD)/drbd.o
diff --git a/sys-cluster/drbd/files/0.6.6-init b/sys-cluster/drbd/files/0.6.6-init
deleted file mode 100644
index f893172db3df..000000000000
--- a/sys-cluster/drbd/files/0.6.6-init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-        use net
-        after logger
-        before nfs
-}
-
-start() {
-        ebegin "Starting drbd"
-        /sbin/drbd start
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping drbd"
-        /sbin/drbd stop
-        eend $?
-}
diff --git a/sys-cluster/drbd/files/0.6.6-scripts-Makefile.patch b/sys-cluster/drbd/files/0.6.6-scripts-Makefile.patch
deleted file mode 100644
index dfee65212754..000000000000
--- a/sys-cluster/drbd/files/0.6.6-scripts-Makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../drbd-cvs/drbd/scripts/Makefile	2003-07-14 10:43:25.000000000 +0200
-+++ scripts/Makefile	2003-09-01 17:32:03.000000000 +0200
-@@ -42,6 +42,9 @@
-   INITD=$(PREFIX)etc/rc.d/init.d/
- endif
- 
-+ifeq ($(DIST),gentoo)
-+  INITD=$(PREFIX)sbin/
-+endif
- 
- all:
- 	ln -sf drbd datadisk
-@@ -52,16 +55,16 @@
- 	mkdir -p $(PREFIX)etc/ha.d/resource.d
- 	install -d $(INITD)
- 	install -m 755 drbd $(INITD)
--	@ if [ ! -e $(PREFIX)etc/drbd.conf ]; then \
--		install -d $(PREFIX)etc/; \
--		install -m 644 drbd.conf $(PREFIX)etc/; \
--	fi
-+#	@ if [ ! -e $(PREFIX)etc/drbd.conf ]; then \
-+#		install -d $(PREFIX)etc/; \
-+#		install -m 644 drbd.conf $(PREFIX)etc/; \
-+#	fi
- 	ln -f $(INITD)drbd $(PREFIX)etc/ha.d/resource.d/datadisk
--ifeq ($(DIST),suse)
--	ln -sf $(INITD)drbd $(PREFIX)sbin/rcdrbd
--endif
--	@ echo
--	@ echo "Don't forget to run update-rc.d or chkconfig"
-+#ifeq ($(DIST),suse)
-+#	ln -sf $(INITD)drbd $(PREFIX)sbin/rcdrbd
-+#endif
-+#	@ echo
-+#	@ echo "Don't forget to run update-rc.d or chkconfig"
- 
- clean:
- 	rm -f *~
diff --git a/sys-cluster/drbd/files/digest-drbd-0.6.12 b/sys-cluster/drbd/files/digest-drbd-0.6.12
deleted file mode 100644
index 05fb3e33c4a6..000000000000
--- a/sys-cluster/drbd/files/digest-drbd-0.6.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0fb5753a750d7057e42a2cbf0e66c89 drbd-0.6.12.tar.gz 217896
diff --git a/sys-cluster/drbd/files/digest-drbd-0.6.6-r2 b/sys-cluster/drbd/files/digest-drbd-0.6.6-r2
deleted file mode 100644
index 104eaf7ad52b..000000000000
--- a/sys-cluster/drbd/files/digest-drbd-0.6.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e716f1616afa03cc5df898969df0b4a drbd-0.6.6.tar.gz 158633