commit: 3a4b745ffd4b29ec546f45d3e271795c2cd5fd38 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Fri Mar 26 10:52:58 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Mar 26 10:52:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4b745f
sys-cluster/drbd-utils: Remove old Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-cluster/drbd-utils/Manifest | 1 - sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 97 ---------------------- .../files/drbd-utils-8.9.6-sysmacros.patch | 44 ---------- sys-cluster/drbd-utils/metadata.xml | 1 - 4 files changed, 143 deletions(-) diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest index 6e60b8b11db..fbc8025e2dd 100644 --- a/sys-cluster/drbd-utils/Manifest +++ b/sys-cluster/drbd-utils/Manifest @@ -1,2 +1 @@ -DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild deleted file mode 100644 index 8295be34e7b..00000000000 --- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bash-completion-r1 eutils multilib udev versionator - -LICENSE="GPL-2" - -DESCRIPTION="mirror/replicate block-devices across a network-connection" -SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"; -HOMEPAGE="http://www.drbd.org"; - -KEYWORDS="amd64 x86" -IUSE="heartbeat pacemaker +udev xen" -SLOT="0" - -DEPEND="heartbeat? ( sys-cluster/heartbeat ) - pacemaker? ( sys-cluster/pacemaker ) - udev? ( virtual/udev ) - !!sys-cluster/drbd" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P/_/}" - -src_prepare() { - # respect LDFLAGS, #453442 - sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \ - -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \ - -i user/*/Makefile.in || die - - # respect multilib - sed -i -e "s:/lib/:/$(get_libdir)/:g" \ - Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die - sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ - -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ - -i user/*/Makefile.in || die - - # correct install paths (really correct this time) - sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ - scripts/Makefile.in || die - - # don't participate in user survey bug 360483 - sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die - sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die - - epatch "${FILESDIR}"/run-lock.patch - - # bug 616758 - epatch "${FILESDIR}/${P}"-sysmacros.patch - - autoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - --without-rgmanager \ - $(use_with udev) \ - $(use_with xen) \ - $(use_with pacemaker) \ - $(use_with heartbeat) \ - --with-bashcompletion \ - --with-distro=gentoo -} - -src_compile() { - # only compile the tools - emake OPTFLAGS="${CFLAGS}" tools -} - -src_install() { - # only install the tools - emake DESTDIR="${D}" install-tools install-doc - dodoc README ChangeLog - - # install our own init script - newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/} - - dodoc scripts/drbd.conf.example - - dosym /usr/sbin/drbdadm /sbin/drbdadm -} - -pkg_postinst() { - einfo - einfo "Please copy and gunzip the configuration file:" - einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf" - 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 - elog "Remember to enable drbd support in kernel." -} diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch deleted file mode 100644 index 135f7a8b3ff..00000000000 --- a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN drbd-utils-8.9.6.orig/user/shared/shared_tool.c drbd-utils-8.9.6/user/shared/shared_tool.c ---- drbd-utils-8.9.6.orig/user/shared/shared_tool.c 2018-05-04 20:13:51.959412972 +0200 -+++ drbd-utils-8.9.6/user/shared/shared_tool.c 2018-05-04 20:14:12.979679788 +0200 -@@ -8,6 +8,7 @@ - #define _FILE_OFFSET_BITS 64 - - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <fcntl.h> -diff -ruN drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c drbd-utils-8.9.6/user/v83/drbdadm_adjust.c ---- drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c 2015-02-11 17:33:00.000000000 +0100 -+++ drbd-utils-8.9.6/user/v83/drbdadm_adjust.c 2018-05-04 20:15:08.060378940 +0200 -@@ -25,6 +25,7 @@ - #define _GNU_SOURCE - - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/wait.h> - #include <unistd.h> -diff -ruN drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c drbd-utils-8.9.6/user/v84/drbdadm_adjust.c ---- drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c 2015-05-08 15:16:31.000000000 +0200 -+++ drbd-utils-8.9.6/user/v84/drbdadm_adjust.c 2018-05-04 20:14:42.192050588 +0200 -@@ -27,6 +27,7 @@ - #define _FILE_OFFSET_BITS 64 - - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/wait.h> - #include <unistd.h> -diff -ruN drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c drbd-utils-8.9.6/user/v9/drbdadm_adjust.c ---- drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c 2018-05-04 20:13:51.960412985 +0200 -+++ drbd-utils-8.9.6/user/v9/drbdadm_adjust.c 2018-05-04 20:14:12.980679801 +0200 -@@ -27,6 +27,7 @@ - #define _FILE_OFFSET_BITS 64 - - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/wait.h> - #include <unistd.h> diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml index 82f50565f99..7e160adde1c 100644 --- a/sys-cluster/drbd-utils/metadata.xml +++ b/sys-cluster/drbd-utils/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="xen">Enable Xen integration</flag> <flag name="pacemaker">Enable Pacemaker integration</flag> - <flag name="heartbeat">Enable Heartbeat integration</flag> </use> <longdescription> The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
