Version bumped. Closes #47802.

7 files changed, 177 insertions, 5 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 0b55b78df2a3..fafed5cf3030 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.4 2004/04/27 21:42:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.5 2004/04/30 15:57:12 tantive Exp $
+
+*drbd-0.6.12 (30 Apr 2004)
+
+  30 Apr 2004; Michael Imhof <tantive@gentoo.org> drbd-0.6.12.ebuild,
+  files/0.6.12-Makefile.vars.patch, files/0.6.12-module-Makefile.patch,
+  files/0.6.12-scripts-Makefile.patch:
+  Version bumped. Closes #47802.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> drbd-0.6.6-r2.ebuild:
   Add inherit eutils
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 3ad066b48d9c..95890293b334 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,8 +1,13 @@
-MD5 7238886297b80de463d954700b05498d drbd-0.6.6-r2.ebuild 1929
-MD5 277b8e866c0ae9dea899f68f8352a20b ChangeLog 947
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 545a301fed86260ef910d0874f31bb2d files/0.6.6-Makefile.vars.patch 936
-MD5 54de4ff29f16698f6d1aa861935f7a53 files/0.6.6-drbd-Makefile.patch 816
+MD5 277b8e866c0ae9dea899f68f8352a20b ChangeLog 947
+MD5 78035689b68c26e01000cd6d1a1934ab drbd-0.6.12.ebuild 2092
+MD5 7238886297b80de463d954700b05498d drbd-0.6.6-r2.ebuild 1929
+MD5 f8ceed0b6be2ded4cdb079d38ac0c3d0 files/0.6.12-Makefile.vars.patch 675
+MD5 7416c44daab264a36cc8c5a2c35e757f files/0.6.12-scripts-Makefile.patch 1072
+MD5 3959588a14b9fba5df432a29d00fa63f files/digest-drbd-0.6.12 63
 MD5 ce7682bc39b5263e80bea51b039e7252 files/0.6.6-init 256
+MD5 54de4ff29f16698f6d1aa861935f7a53 files/0.6.6-drbd-Makefile.patch 816
+MD5 545a301fed86260ef910d0874f31bb2d files/0.6.6-Makefile.vars.patch 936
 MD5 0fd7f6bf10cd5fc99f2c79c88355ea8c files/0.6.6-scripts-Makefile.patch 1008
 MD5 7fccd0c1159fb79cd60fc45ace182a56 files/digest-drbd-0.6.6-r2 62
+MD5 52dc2e272f064349f8f70277159d4a5f files/0.6.12-module-Makefile.patch 776
diff --git a/sys-cluster/drbd/drbd-0.6.12.ebuild b/sys-cluster/drbd/drbd-0.6.12.ebuild
new file mode 100644
index 000000000000..0f7ed7c2e449
--- /dev/null
+++ b/sys-cluster/drbd/drbd-0.6.12.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/30 15:57:12 tantive 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/files/0.6.12-Makefile.vars.patch b/sys-cluster/drbd/files/0.6.12-Makefile.vars.patch
new file mode 100644
index 000000000000..bb18dbcb412d
--- /dev/null
+++ b/sys-cluster/drbd/files/0.6.12-Makefile.vars.patch
@@ -0,0 +1,21 @@
+--- Makefile.vars	2004-04-14 11:35:11.000000000 +0200
++++ Makefile.vars2	2004-04-14 15:25:07.000000000 +0200
+@@ -23,7 +23,7 @@
+ # export all variables not explicitly _un_exported
+ export
+ 
+-PREFIX          := /
++#PREFIX          := /
+ 
+ CC           	:= gcc
+ USERFLAGS    	:= -Wall $(DEBUGFLAGS)
+@@ -44,7 +44,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,))))))))
+ 
+ SUBDIRS = user documentation scripts benchmark drbd #testing
+ 
diff --git a/sys-cluster/drbd/files/0.6.12-module-Makefile.patch b/sys-cluster/drbd/files/0.6.12-module-Makefile.patch
new file mode 100644
index 000000000000..082b9be24ae5
--- /dev/null
+++ b/sys-cluster/drbd/files/0.6.12-module-Makefile.patch
@@ -0,0 +1,19 @@
+--- Makefile	2004-02-10 13:49:10.000000000 +0100
++++ _Makefile	2004-04-14 18:14:41.000000000 +0200
+@@ -134,10 +134,10 @@
+ 	test -n "$(KERNELRELEASE)"
+ 	install -D -m 644 drbd.o "$(PREFIX)lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)/drbd.o"
+ 	install -d -m 700 "$(PREFIX)var/lib/drbd"
+-  ifeq ($(shell uname -r),$(KERNELRELEASE))
+-	/sbin/depmod -a || /sbin/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),$(KERNELRELEASE))
++#	/sbin/depmod -a || /sbin/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
+ endif
diff --git a/sys-cluster/drbd/files/0.6.12-scripts-Makefile.patch b/sys-cluster/drbd/files/0.6.12-scripts-Makefile.patch
new file mode 100644
index 000000000000..a4fc3b9a251d
--- /dev/null
+++ b/sys-cluster/drbd/files/0.6.12-scripts-Makefile.patch
@@ -0,0 +1,37 @@
+--- Makefile.org	2004-04-14 16:37:03.000000000 +0200
++++ Makefile	2004-04-14 16:37:00.000000000 +0200
+@@ -42,6 +42,10 @@
+   INITD=etc/rc.d/init.d/
+ endif
+ 
++ifeq ($DIST),gentoo)
++  INITD=$(PREFIX)sbin/
++endif
++
+ ifeq ($(INITD),,)
+    $(warning Can not guess distribution INITD, please fix Makefile.vars)
+    $(warning Assume INITD=etc/init.d according to LSB)
+@@ -54,15 +58,15 @@
+ install:
+ 	mkdir -p $(PREFIX)etc/ha.d/resource.d
+ 	install -D -m 755 drbd $(PREFIX)$(INITD)/drbd
+-	@ if [ ! -e $(PREFIX)etc/drbd.conf ]; then \
+-		install -D -m 644 drbd.conf $(PREFIX)etc/drbd.conf; \
+-	fi
++#	@ if [ ! -e $(PREFIX)etc/drbd.conf ]; then \
++#		install -D -m 644 drbd.conf $(PREFIX)etc/drbd.conf; \
++#	fi
+ 	ln -sf ../../../$(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
new file mode 100644
index 000000000000..05fb3e33c4a6
--- /dev/null
+++ b/sys-cluster/drbd/files/digest-drbd-0.6.12
@@ -0,0 +1 @@
+MD5 b0fb5753a750d7057e42a2cbf0e66c89 drbd-0.6.12.tar.gz 217896