Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/libdlm/files/, profiles/base/, sys-cluster/libdlm/, profiles/
Date: Tue, 04 Dec 2018 13:36:26
Message-Id: 1543930459.006a543210352352b8e53dbb554126090743e1b7.mgorny@gentoo
1 commit: 006a543210352352b8e53dbb554126090743e1b7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 4 13:28:39 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 4 13:34:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006a5432
7
8 sys-cluster/libdlm: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/618050
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/base/package.use.stable.mask | 4 --
14 profiles/package.mask | 1 -
15 sys-cluster/libdlm/Manifest | 2 -
16 .../libdlm/files/libdlm-3.2.0-sysmacros.patch | 11 ----
17 sys-cluster/libdlm/libdlm-3.1.5.ebuild | 62 -------------------
18 sys-cluster/libdlm/libdlm-3.2.0.ebuild | 70 ----------------------
19 sys-cluster/libdlm/metadata.xml | 9 ---
20 7 files changed, 159 deletions(-)
21
22 diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
23 index 276b56ec0e8..be3419541d8 100644
24 --- a/profiles/base/package.use.stable.mask
25 +++ b/profiles/base/package.use.stable.mask
26 @@ -205,10 +205,6 @@ media-libs/libcaca java mono
27 # dev-libs/opencryptoki will not be stabile any time soon (bug#510204)
28 app-crypt/tpm-tools pkcs11
29
30 -# Samuli Suominen <ssuominen@g.o> (01 Aug 2013)
31 -# The dependencies for these flags are still in ~arch.
32 -sys-fs/lvm2 clvm
33 -
34 # Doug Goldstein <cardoe@g.o> (12 Sep 2013)
35 # Waiting on glusterfs maintainers in bug #484016
36 app-emulation/qemu glusterfs
37
38 diff --git a/profiles/package.mask b/profiles/package.mask
39 index d0c28b1ffbc..d7dc028ca61 100644
40 --- a/profiles/package.mask
41 +++ b/profiles/package.mask
42 @@ -427,7 +427,6 @@ app-admin/syslogread
43 # Pacho Ramos <pacho@g.o> (04 Nov 2018)
44 # Upstream dead for many years and nobody taking care of them, bug #443842,
45 # bug #618050. Removal in a month.
46 -sys-cluster/libdlm
47 sys-cluster/fence-agents
48 sys-cluster/libccs
49 sys-cluster/libccs-perl
50
51 diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
52 deleted file mode 100644
53 index d2c92a8591f..00000000000
54 --- a/sys-cluster/libdlm/Manifest
55 +++ /dev/null
56 @@ -1,2 +0,0 @@
57 -DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
58 -DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
59
60 diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
61 deleted file mode 100644
62 index 3a8a8b11fa1..00000000000
63 --- a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
64 +++ /dev/null
65 @@ -1,11 +0,0 @@
66 -diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c cluster-3.2.0/dlm/libdlm/libdlm.c
67 ---- cluster-3.2.0.orig/dlm/libdlm/libdlm.c 2012-11-26 05:13:22.000000000 +0100
68 -+++ cluster-3.2.0/dlm/libdlm/libdlm.c 2018-04-29 23:46:57.591160008 +0200
69 -@@ -5,6 +5,7 @@
70 - #include <sys/ioctl.h>
71 - #include <sys/param.h>
72 - #include <sys/stat.h>
73 -+#include <sys/sysmacros.h>
74 - #include <stdint.h>
75 - #include <stdlib.h>
76 - #include <inttypes.h>
77
78 diff --git a/sys-cluster/libdlm/libdlm-3.1.5.ebuild b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
79 deleted file mode 100644
80 index 8c6593cb92b..00000000000
81 --- a/sys-cluster/libdlm/libdlm-3.1.5.ebuild
82 +++ /dev/null
83 @@ -1,62 +0,0 @@
84 -# Copyright 1999-2015 Gentoo Foundation
85 -# Distributed under the terms of the GNU General Public License v2
86 -
87 -EAPI=5
88 -
89 -inherit multilib toolchain-funcs versionator
90 -
91 -CLUSTER_RELEASE="${PV}"
92 -MY_P="cluster-${CLUSTER_RELEASE}"
93 -
94 -MAJ_PV="$(get_major_version)"
95 -MIN_PV="$(get_version_component_range 2-3)"
96 -
97 -DESCRIPTION="General-purpose Distributed Lock Manager Library"
98 -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
99 -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
100 -
101 -LICENSE="LGPL-2.1"
102 -SLOT="0"
103 -KEYWORDS="~amd64 ~hppa ~x86"
104 -IUSE="static-libs"
105 -
106 -RDEPEND="
107 - !sys-cluster/dlm-headers
108 - !sys-cluster/dlm-kernel
109 - !sys-cluster/dlm-lib"
110 -DEPEND="${RDEPEND}
111 - >=sys-kernel/linux-headers-2.6.24"
112 -
113 -S=${WORKDIR}/${MY_P}/dlm
114 -
115 -src_configure() {
116 - cd "${WORKDIR}/${MY_P}"
117 - ./configure \
118 - --cc=$(tc-getCC) \
119 - --cflags="-Wall" \
120 - --libdir=/usr/$(get_libdir) \
121 - --disable_kernel_check \
122 - --kernel_src=/usr/ \
123 - --somajor="$MAJ_PV" \
124 - --sominor="$MIN_PV" \
125 - --dlmlibdir=/usr/$(get_libdir) \
126 - --dlmincdir=/usr/include \
127 - --dlmcontrollibdir=/usr/$(get_libdir) \
128 - --dlmcontrolincdir=/usr/include \
129 - || die "configure problem"
130 -}
131 -
132 -src_compile() {
133 - for i in libdlm libdlmcontrol; do
134 - emake -C ${i}
135 - done
136 -}
137 -
138 -src_install() {
139 - for i in libdlm libdlmcontrol; do
140 - emake DESTDIR="${D}" -C ${i} install
141 - done
142 - use static-libs || rm -f "${D}"/usr/lib*/*.a
143 - doman man/libdlm.3
144 - dodoc doc/{libdlm.txt,example.c,user-dlm-overview.txt}
145 -}
146
147 diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
148 deleted file mode 100644
149 index aebc2e1b0ea..00000000000
150 --- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
151 +++ /dev/null
152 @@ -1,70 +0,0 @@
153 -# Copyright 1999-2018 Gentoo Foundation
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=5
157 -
158 -inherit multilib toolchain-funcs versionator epatch
159 -
160 -CLUSTER_RELEASE="${PV}"
161 -MY_P="cluster-${CLUSTER_RELEASE}"
162 -
163 -MAJ_PV="$(get_major_version)"
164 -MIN_PV="$(get_version_component_range 2-3)"
165 -
166 -DESCRIPTION="General-purpose Distributed Lock Manager Library"
167 -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
168 -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
169 -
170 -LICENSE="LGPL-2.1"
171 -SLOT="0"
172 -KEYWORDS="amd64 ~arm64 ~hppa x86"
173 -IUSE="static-libs"
174 -
175 -RDEPEND="
176 - !sys-cluster/dlm-headers
177 - !sys-cluster/dlm-kernel
178 - !sys-cluster/dlm-lib"
179 -DEPEND="${RDEPEND}
180 - >=sys-kernel/linux-headers-2.6.24"
181 -
182 -S="${WORKDIR}/${MY_P}/dlm"
183 -
184 -src_prepare() {
185 - sed -i \
186 - -e "s|/lib|/$(get_libdir)|g" \
187 - "${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
188 - epatch "${FILESDIR}/${P}-sysmacros.patch"
189 -}
190 -
191 -src_configure() {
192 - cd "${WORKDIR}/${MY_P}"
193 - ./configure \
194 - --cc=$(tc-getCC) \
195 - --cflags="-Wall" \
196 - --libdir=/usr/$(get_libdir) \
197 - --disable_kernel_check \
198 - --kernel_src=/usr/ \
199 - --somajor="$MAJ_PV" \
200 - --sominor="$MIN_PV" \
201 - --dlmlibdir=/usr/$(get_libdir) \
202 - --dlmincdir=/usr/include \
203 - --dlmcontrollibdir=/usr/$(get_libdir) \
204 - --dlmcontrolincdir=/usr/include \
205 - || die "configure problem"
206 -}
207 -
208 -src_compile() {
209 - for i in libdlm libdlmcontrol; do
210 - emake -C ${i}
211 - done
212 -}
213 -
214 -src_install() {
215 - for i in libdlm libdlmcontrol; do
216 - emake DESTDIR="${D}" -C ${i} install
217 - done
218 - mv "${D}"/$(get_libdir) "${D}"/lib
219 - use static-libs || rm -f "${D}"/usr/lib*/*.a
220 - doman man/libdlm.3
221 - dodoc doc/{libdlm.txt,example.c,user-dlm-overview.txt}
222 -}
223
224 diff --git a/sys-cluster/libdlm/metadata.xml b/sys-cluster/libdlm/metadata.xml
225 deleted file mode 100644
226 index d3f8da79cd5..00000000000
227 --- a/sys-cluster/libdlm/metadata.xml
228 +++ /dev/null
229 @@ -1,9 +0,0 @@
230 -<?xml version="1.0" encoding="UTF-8"?>
231 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
232 -<pkgmetadata>
233 - <maintainer type="project">
234 - <email>cluster@g.o</email>
235 - <name>Gentoo Cluster Project</name>
236 - </maintainer>
237 - <longdescription>General-purpose Distributed Lock Manager Library</longdescription>
238 -</pkgmetadata>