Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/mdadm: ChangeLog mdadm-3.2.1.ebuild
Date: Sat, 12 Nov 2011 21:12:09
Message-Id: 20111112210644.416822004B@flycatcher.gentoo.org
1 vapier 11/11/12 21:06:44
2
3 Modified: ChangeLog mdadm-3.2.1.ebuild
4 Log:
5 Drop support for baselayout-1, and move to EAPI=2.
6
7 (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.146 sys-fs/mdadm/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/ChangeLog?rev=1.146&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/ChangeLog?rev=1.146&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/ChangeLog?r1=1.145&r2=1.146
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v
19 retrieving revision 1.145
20 retrieving revision 1.146
21 diff -u -r1.145 -r1.146
22 --- ChangeLog 11 Jun 2011 21:12:39 -0000 1.145
23 +++ ChangeLog 12 Nov 2011 21:06:44 -0000 1.146
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sys-fs/mdadm
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.145 2011/06/11 21:12:39 maekke Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.146 2011/11/12 21:06:44 vapier Exp $
29 +
30 + 12 Nov 2011; Mike Frysinger <vapier@g.o> mdadm-3.2.1.ebuild,
31 + +files/mdraid.rc:
32 + Drop support for baselayout-1, and move to EAPI=2.
33
34 11 Jun 2011; Markus Meier <maekke@g.o> mdadm-3.1.4.ebuild,
35 mdadm-3.1.5.ebuild:
36
37
38
39 1.2 sys-fs/mdadm/mdadm-3.2.1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild?r1=1.1&r2=1.2
44
45 Index: mdadm-3.2.1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- mdadm-3.2.1.ebuild 8 Apr 2011 00:13:19 -0000 1.1
52 +++ mdadm-3.2.1.ebuild 12 Nov 2011 21:06:44 -0000 1.2
53 @@ -1,7 +1,8 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.1 2011/04/08 00:13:19 vapier Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.2 2011/11/12 21:06:44 vapier Exp $
58
59 +EAPI="2"
60 inherit eutils flag-o-matic toolchain-funcs
61
62 DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
63 @@ -15,20 +16,18 @@
64 IUSE="static"
65
66 DEPEND=""
67 -RDEPEND=">=sys-apps/util-linux-2.16"
68 +RDEPEND="!<sys-apps/baselayout-2
69 + >=sys-apps/util-linux-2.16"
70
71 # The tests edit values in /proc and run tests on software raid devices.
72 # Thus, they shouldn't be run on systems with active software RAID devices.
73 RESTRICT="test"
74
75 -src_unpack() {
76 - unpack ${A}
77 - cd "${S}"
78 +src_prepare() {
79 epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
80 epatch "${FILESDIR}"/${PN}-3.2.1-syslog-updates.patch
81 epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
82 epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175
83 - use static && append-ldflags -static
84 }
85
86 mdadm_emake() {
87 @@ -41,6 +40,7 @@
88 }
89
90 src_compile() {
91 + use static && append-ldflags -static
92 mdadm_emake all mdassemble
93 }
94
95 @@ -56,15 +56,11 @@
96 dosbin mdassemble || die
97 dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
98
99 - exeinto /$(get_libdir)/rcscripts/addons
100 - newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
101 - newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
102 -
103 insinto /etc
104 newins mdadm.conf-example mdadm.conf
105 newinitd "${FILESDIR}"/mdadm.rc mdadm || die
106 newconfd "${FILESDIR}"/mdadm.confd mdadm || die
107 - newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
108 + newinitd "${FILESDIR}"/mdraid.rc mdraid || die
109 newconfd "${FILESDIR}"/mdraid.confd mdraid || die
110
111 # do not rely on /lib -> /libXX link