reinit the tree, so we can have metadata

8 files changed, 253 insertions, 0 deletions

diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest
new file mode 100644
index 000000000000..fae36113bb6e
--- /dev/null
+++ b/sys-cluster/drbd-kernel/Manifest
@@ -0,0 +1,12 @@
+AUX drbd-8.0.16-kernel-2.6.30-compile-fix.patch 394 SHA256 75201a1d384be2ed7dffec833d45701ca8f9941bcce8a54afbee1ed270d7f756 SHA512 ccdbee8ed89a06746914bcbb5b5120ddc32c7e671fe13f1c337fa86aef2d2bc2994efbbe3ac5030c325a164f5331d9cf30d9c1e7ffc9c46c06aadbd3705afcc7 WHIRLPOOL e16de59cc9f1df9a4f508112bcea9997d20ed9df3a3fe7b87948692ea072bc40668d7e4e285e44aae8bdac310193a46467683dea6d326ba638bc243a4f3ac905
+AUX drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch 679 SHA256 594527b03820de4f8fbfbdfdbfeb004242e8a712575fb2854f0f6b99880d9b36 SHA512 872df2e12dc9a47785c37dd6a82e060e5af751f90b23962f2164c609f6e0ae64b9b9dfbc3e52f7b60422ab3c9069bf17aea20a9b1ad3042f300356d2084d7a31 WHIRLPOOL 52678628e6305805fbc4ef258f268d3ac960b67cfb1a1d08cb059ca0379df1571eddbe0118405cb26859dde428b1a9ce25672cbeb64f22bb5fdc2a2f44ad9734
+AUX drbd-kernel-8.3.6-linux-2.6.32.patch 1243 SHA256 bc6f22124bc2b7e573cea4e69724c49b914a195ee7c626ce346c584e89c61525 SHA512 f41f4c6e5e9ce9a0425c813a384b8b86d8fc92730eac8a08be10dcc8eb1c912057923929cbf044d9807f292c1ae908bade7868ea636afd3ba4237fb5aae502de WHIRLPOOL 9bebc2808571c1c171ec8ebef7532d2ac527a78043cc672568c113fc2bd229688de78011a273f9b19d6135fe4e9f18a23e6d5faf3390c3c637a39e3c26592e2e
+DIST drbd-8.0.16.tar.gz 322758 SHA256 3bdb662663d308da9d871cc66ddc9e807a10ad5ab510a33b62877231150bc059 SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17 WHIRLPOOL 75e56a3dcc0a53a82c3e542ce60a9871de70257ebf1834e067fc2bbb1bdefa4f07c6ef6217aa6f4214ecea2f04f372e0ae218ceab388678137f38e56f7420173
+DIST drbd-8.3.6.tar.gz 457469 SHA256 ea1220705845df6f6490624698904f28854fe74caf047a5d01454b9abd892ce3 SHA512 0e817d514b60891c70532511b99d7cddf24e3fa261b605bc920ad7ab2d4530682f84b78eb0a2ed9c25a8458a43496e8de61addade63b8f6e252a36b6b1d50cef WHIRLPOOL 31b859c91b56912a1b865ff2a406d991ee9e2f42a2afa87e450e7aa838926abaf6a74606f076a575fed73d756b25e7eb0902b3e37589aa71e5fd211220717ce6
+DIST drbd-8.3.8.1.tar.gz 482582 SHA256 2b7e8a3895e89824d41d7dce8d55d127baba857c509bc2477925b0aecaf5689b SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f WHIRLPOOL af4f6a1a8a7d51626d508e834e1465c079bd386f24ecdd3495221bafc3f9c766d6d583934995b88372bbed8e1e7bd3d19186c4eab40c123c5c700fc3de7742e9
+EBUILD drbd-kernel-8.0.16.ebuild 1298 SHA256 1e84591454c4690ef1f75b3aa98220e6d34b01d1d58444aed2b7657ec8b37bf1 SHA512 90030164bf8e2061e4a8fddc2a77bae3ca9a4aecac6f2aed69182cbcb767f1e6f5ba48329dd32aabb0b486b75f1a08852df0f7accb2947135172238c6b6ce944 WHIRLPOOL b4ee88fb1fb4fb4620f699344a1777e8c75888ea8b66066f847618e1ca3c00f5374b58eaee0fb263a600f09fb3953e51a321420216dcd639bb5449a05eecd55a
+EBUILD drbd-kernel-8.3.6.ebuild 1176 SHA256 352ed596e09e4dc844168f5259f1aa8adbb37332a172453dadbb91ce32d557f5 SHA512 e3e7215d2ba88cc360873f47710228f364d038e7de11221dcd8a6b4ac14ac784c13a3697768c3d9286f7e62205593164a51be6faa84fb6258c9737fbe39a4411 WHIRLPOOL 10412e0684cd404bafdc25e04597e896cab4204e5f9576126d078b8f99fe02b49ea1f4504bc857455c97ff4b1d03b378c5833fb0371c055d78becdb364eb031c
+EBUILD drbd-kernel-8.3.8.1.ebuild 1391 SHA256 b39b6aec31a30d4b9a3b236d48f24e0a8a87448f88ddeaaa2fd7cb30b6d0c9d7 SHA512 88db68a055e22bb464885ca82a53dec55168a5698fd6cc623430517c60da49621a53dff2e64ee80814d136f4f4f21938592f68df7a21eee409af572658642d89 WHIRLPOOL 1f375fe2355ef706da1ae47a05366053d272e505d3915dd034207fa574d67e361d94af4a607c947488c5a39cfd11fa97b27fbce8f692447e9c6b44aff789173e
+MISC ChangeLog 2737 SHA256 d1e77f3c2dfd0411d59df6f03510a2843a88ac02bd5f3b7015259bed1216208b SHA512 fe55570836cfc8209250f5895311c5748f64dcc8da10fc97bd520f61a6494da7d13c3d19b2162163633c1926a080fbbeb65e6ef2e443c622db0bbac9e8dc55dd WHIRLPOOL 50db2af0460157a01146cdcc9ac5cbebbdae97d1db1668bf3750b3750dc8577025e9180adbf8e1804efd5f992eccf0b7706a63f8a4dd690b8d5e81222f14aa13
+MISC ChangeLog-2015 5006 SHA256 f1dcf200cac0ae3e118b365473917279b6de66acfbf541a294e1dc0e84275cbf SHA512 632a014108ebb78c17d475f1be4d5774b364e12dfc7d33af370c03f111cdc1256d195dafb5577db46971afbd884eda886919ce73d1fe872d4097778ebbc1c83a WHIRLPOOL 1c5246aa62ac5f6f20b964d4eea89d9f4b65b2ed9173c5c9b5ada932038755f54fbc8c4b9d71f35a374c4169ef7316f8b312b8db0d4fed09a4736de6afb88f6f
+MISC metadata.xml 253 SHA256 5030a84d36a522ae62530f6406dbda5099255457f76b3ed419dcffc6d7383667 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba WHIRLPOOL c55ba84102cbd078e50dd719902811669b3913122f44e982c90039b27067446810d881e73a22ed410edc41a409a273fd355be8a6d627bb0e67717b6a33d5fe1e
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
new file mode 100644
index 000000000000..c7940d8f75ab
--- /dev/null
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils versionator linux-mod
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+MY_PN="${PN/-kernel/}"
+MY_P="${MY_PN}-${PV}"
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+
+HOMEPAGE="http://www.drbd.org"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! kernel_is -ge 2 6; then
+		die "Unsupported kernel, drbd-8.0.x needs kernel 2.6.x ."
+	fi
+
+	MODULE_NAMES="drbd(block:${S}/drbd)"
+	BUILD_TARGETS="default"
+	CONFIG_CHECK="CONNECTOR"
+	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
+	linux-mod_pkg_setup
+	BUILD_PARAMS="-j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die
+	epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
+	einfo ""
+}
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
new file mode 100644
index 000000000000..a204c0f4fc5a
--- /dev/null
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils versionator linux-mod
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 x86"
+
+MY_PN="${PN/-kernel/}"
+MY_P="${MY_PN}-${PV}"
+MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
+
+HOMEPAGE="http://www.drbd.org"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
+
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linux-2.6.32.patch
+}
+
+pkg_setup() {
+	if ! kernel_is -ge 2 6; then
+		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
+	fi
+
+	MODULE_NAMES="drbd(block:${S}/drbd)"
+	BUILD_TARGETS="default"
+	CONFIG_CHECK="CONNECTOR"
+	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
+	linux-mod_pkg_setup
+	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
+	einfo ""
+}
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
new file mode 100644
index 000000000000..8c2a7bc6cdbb
--- /dev/null
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils versionator linux-mod
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+MY_PN=${PN/-kernel/}
+MY_P=${MY_PN}-${PV}
+MY_MAJ_PV=$(get_version_component_range 1-2 ${PV})
+
+HOMEPAGE="http://www.drbd.org"
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
+
+IUSE=""
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! kernel_is -ge 2 6; then
+		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
+	elif [ ${KV_PATCH} -ge 33 ]; then
+		ewarn "Your kernel (${KV_FULL}) is too new to use this package."
+		ewarn "The DRBD module has been merged into kernel >= 2.6.33."
+		ewarn "Please compile the DRBD module from your current kernel."
+		die "${PN} is obsolete with kernel >= 2.6.33."
+	fi
+
+	MODULE_NAMES="drbd(block:${S}/drbd)"
+	BUILD_TARGETS="default"
+	CONFIG_CHECK="CONNECTOR"
+	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
+	linux-mod_pkg_setup
+	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge drbd-kernel when you upgrade your kernel!"
+	einfo ""
+}
diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
new file mode 100644
index 000000000000..c7b4f814077e
--- /dev/null
+++ b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
@@ -0,0 +1,12 @@
+--- drbd-8.0.16/drbd/drbd_main.c.orig	2009-08-04 17:55:52.000000000 +0300
++++ drbd-8.0.16/drbd/drbd_main.c	2009-08-04 17:56:35.000000000 +0300
+@@ -2770,7 +2770,9 @@
+ 	}
+ 
+ 	drbd_proc->proc_fops = &drbd_proc_fops;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ 	drbd_proc->owner = THIS_MODULE;
++#endif
+ #else
+ # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
+ #endif
diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch
new file mode 100644
index 000000000000..beb07fbdaeb9
--- /dev/null
+++ b/sys-cluster/drbd-kernel/files/drbd-kernel-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 \
diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
new file mode 100644
index 000000000000..893f9c2e21fe
--- /dev/null
+++ b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
@@ -0,0 +1,46 @@
+--- drbd-8.3.6/drbd/drbd_req.c
++++ drbd-8.3.6/drbd/drbd_req.c
+@@ -55,13 +55,21 @@
+ 	__disk_stat_inc(mdev->vdisk, ios[rw]);
+ 	__disk_stat_add(mdev->vdisk, sectors[rw], bio_sectors(bio));
+ 	disk_round_stats(mdev->vdisk);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
++	mdev->vdisk->in_flight[rw]++;
++#else
+	mdev->vdisk->in_flight++;
++#endif
+ #else
+ 	cpu = part_stat_lock();
+ 	part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
+ 	part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
+ 	part_stat_unlock();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
++	mdev->vdisk->part0.in_flight[rw]++;
++#else
+	mdev->vdisk->part0.in_flight++;
++#endif
+ #endif
+ }
+ 
+@@ -77,13 +85,21 @@
+ #ifdef __disk_stat_add
+ 	__disk_stat_add(mdev->vdisk, ticks[rw], duration);
+ 	disk_round_stats(mdev->vdisk);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
++	mdev->vdisk->in_flight[rw]--;
++#else
+ 	mdev->vdisk->in_flight--;
++#endif
+ #else
+ 	cpu = part_stat_lock();
+ 	part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
+ 	part_round_stats(cpu, &mdev->vdisk->part0);
+ 	part_stat_unlock();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
++	mdev->vdisk->part0.in_flight[rw]--;
++#else
+ 	mdev->vdisk->part0.in_flight--;
++#endif
+ #endif
+ }
+ 
diff --git a/sys-cluster/drbd-kernel/metadata.xml b/sys-cluster/drbd-kernel/metadata.xml
new file mode 100644
index 000000000000..4a09d7ba8d61
--- /dev/null
+++ b/sys-cluster/drbd-kernel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>cluster@gentoo.org</email>
+	<name>Gentoo Cluster Project</name>
+</maintainer>
+</pkgmetadata>