Drop support for baselayout-1, and move to EAPI=2.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index c3db524b529be901ba10c6fd2acba28bacfeb9b5..26913735158ec45b9146a91d541e6a59aeeaa357 100644 (file)
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.145 2011/06/11 21:12:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.146 2011/11/12 21:06:44 vapier Exp $
+
+  12 Nov 2011; Mike Frysinger <vapier@gentoo.org> mdadm-3.2.1.ebuild,
+  +files/mdraid.rc:
+  Drop support for baselayout-1, and move to EAPI=2.
 
   11 Jun 2011; Markus Meier <maekke@gentoo.org> mdadm-3.1.4.ebuild,
   mdadm-3.1.5.ebuild:

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index ea7996580af799910bb5f8534352e5662a3d3dab..34817b2ea74734424845ee10fb8f03b18bad98b3 100644 (file)
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX mdadm-2.6-syslog-updates.patch 1117 RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 SHA1 c00f4f283acd226241aed07e35133f965bb8b154 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86
 AUX mdadm-2.6.4-mdassemble.patch 465 RMD160 4abcfcd75242d552f674a850ea116835a8f56aea SHA1 609161b594c51644f30de98a7a74473361bdb98b SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4
@@ -11,6 +11,7 @@ AUX mdadm-3.2.1-syslog-updates.patch 2173 RMD160 f8a52b1a0c1fa024fac161c9e667b3b
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
 AUX mdraid.confd 225 RMD160 944896151ffdaf7b172c8d045d3cf9bd9083fabd SHA1 41b2e6441e1bac71657290a6764774fb0d452721 SHA256 1b7918c4bdd024607bcb49d7cea0a77cb70502d2fbb4dbe07024bb5b5699c8e0
+AUX mdraid.rc 838 RMD160 ca2d2d52dad0e81ea01cb44f1a744fcdbcd2181e SHA1 33458e0764697504034a7c76de658e3fd63a42c1 SHA256 73303ec32b7010c7f6d4fd66dde1a5baea07e73c79d3e516dce31000abdb4089
 AUX mdraid.rc-3.1.1 815 RMD160 df283e9b55ba6df3ac209861e18c3197ede51885 SHA1 a34072a43037ec9f8c4bc858660bb261a6dfff1d SHA256 95f759ba9d4f719bb5122546fdcce18dd9b0060df1296cf8ae17a04137e163e2
 AUX raid-start.sh-3.0 799 RMD160 6495c44ea5be6e18a2b76e0c724f2dbf36073f90 SHA1 2df50d9f03cc907990ddd4b235dbc605c3e208c8 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
@@ -19,13 +20,13 @@ DIST mdadm-3.1.5.tar.bz2 292709 RMD160 e0542c4556988cae551b3399f0f0d27e42b68bda
 DIST mdadm-3.2.1.tar.bz2 348062 RMD160 a05f6786b13f649899195e3bbb744d1704c0d004 SHA1 4e85f65748c8070a6b4befa1eab0688baaf93127 SHA256 7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125
 EBUILD mdadm-3.1.4.ebuild 2265 RMD160 3ecc8441938b6280e174272ef926c8f9b3f15a97 SHA1 2c5de61b9a6f53adfb01d575a3ec88d6b3117a70 SHA256 832f1f81afb743e62e51c598261c93cf778c5bd4276586e08fb72818cffe4db6
 EBUILD mdadm-3.1.5.ebuild 2223 RMD160 0ef216b3ea0f49a15fb63a322dfe1cf97764a8cb SHA1 85f876251597fe31f6a700481bd9b969aa6cdc28 SHA256 5d429930b7b7af3d1f117c676a3f97d1b8b17bbdb86eb15fcb2e229989bcca3e
-EBUILD mdadm-3.2.1.ebuild 2241 RMD160 202c2cc23aafce9657b1924423aa221b8eddffd7 SHA1 ca8550951a4ba67d208900cdbf433050763267b8 SHA256 ece8c62682c54dc7762820935aa72b1dd08dac06c9b8f29f929cc059e3ef9316
-MISC ChangeLog 22216 RMD160 264f0680dbefdd4837b284e82401928bd927bcc4 SHA1 7de2d182bd7790979cbd67c0c3a44521bc235b23 SHA256 1b9d26cf56cd3e067d88946956293ec3d0ac048e26616274f9b69e6821bf4e8d
+EBUILD mdadm-3.2.1.ebuild 2088 RMD160 c47998464429b1259f646aab3f596679fc4eae70 SHA1 eba277314c7962cf85f52dfad759069661b571df SHA256 9350c7cc56e44efad784447dc4a238cbf0adf30808802dc412ffcb4362fdbbe7
+MISC ChangeLog 22360 RMD160 30596c9fbfe413ba1c6c30ef0fbe19112ef58f1e SHA1 d10aa068da7b063200d15338e085619162a4c9b0 SHA256 b8003d6381a06bcd32ffb210ac2d453689a89a14468dfa75a64d3ca9f7eac0c4
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3z2sEACgkQkKaRLQcq0GLn+QCgiyAp3JXxnr+aPQZv4tImJL+p
-JusAn3pcRaFoDY6KJwwXBOO7bf+WJ4U4
-=wTig
+iF0EAREIAAYFAk6+3+oACgkQaC/OocHi7Ja2/wD/QEqb32GDWRV2ia+YXhCTYT21
+cECtNcws/254IrSHfSgA9Alh5t1qZvN0rG+k5xXfXqJUZlSncPKdGsSVBJKXGi8=
+=aqQs
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/mdadm/files/mdraid.rc b/sys-fs/mdadm/files/mdraid.rc
new file mode 100644 (file)
index 0000000..27421e2
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.rc
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.6 2011/11/12 21:06:44 vapier Exp $
+
+depend() {
+       before checkfs fsck
+       after modules
+}
+
+start() {
+       local output
+
+       ebegin "Starting up RAID devices"
+       output=$(mdadm -As 2>&1)
+       eend $? "${output}"
+
+       local pat="/dev/md_d*"
+       set -- ${pat}
+       if [ "$*" != "${pat}" ] ; then
+               ebegin "Creating RAID device partitions"
+               blockdev "$@"
+               eend $?
+               # wait because vgscan runs next, and we want udev to fire
+               sleep 1
+       fi
+
+       return 0
+}
+
+stop() {
+       local output
+
+       # XXX: Maybe drop this check ?
+       [ ! -e /etc/mdadm/mdadm.conf ] && [ ! -e /etc/mdadm.conf ] && return 0
+
+       ebegin "Shutting down RAID devices (mdadm)"
+       output=$(mdadm -Ss 2>&1)
+       eend $? "${output}"
+}

diff --git a/sys-fs/mdadm/mdadm-3.2.1.ebuild b/sys-fs/mdadm/mdadm-3.2.1.ebuild
index d452ab8c30b6a3c31b75250fcd21d6ab6d22561a..04be7630085a30050154a75869e33a7e2ceaa31d 100644 (file)
--- a/sys-fs/mdadm/mdadm-3.2.1.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.1 2011/04/08 00:13:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.1.ebuild,v 1.2 2011/11/12 21:06:44 vapier Exp $
 
+EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
@@ -15,20 +16,18 @@ SLOT="0"
 IUSE="static"
 
 DEPEND=""
-RDEPEND=">=sys-apps/util-linux-2.16"
+RDEPEND="!<sys-apps/baselayout-2
+       >=sys-apps/util-linux-2.16"
 
 # The tests edit values in /proc and run tests on software raid devices.
 # Thus, they shouldn't be run on systems with active software RAID devices.
 RESTRICT="test"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
        epatch "${FILESDIR}"/${PN}-3.2.1-syslog-updates.patch
        epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
        epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175
-       use static && append-ldflags -static
 }
 
 mdadm_emake() {
@@ -41,6 +40,7 @@ mdadm_emake() {
 }
 
 src_compile() {
+       use static && append-ldflags -static
        mdadm_emake all mdassemble
 }
 
@@ -56,15 +56,11 @@ src_install() {
        dosbin mdassemble || die
        dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
 
-       exeinto /$(get_libdir)/rcscripts/addons
-       newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
-       newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
-
        insinto /etc
        newins mdadm.conf-example mdadm.conf
        newinitd "${FILESDIR}"/mdadm.rc mdadm || die
        newconfd "${FILESDIR}"/mdadm.confd mdadm || die
-       newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
+       newinitd "${FILESDIR}"/mdraid.rc mdraid || die
        newconfd "${FILESDIR}"/mdraid.confd mdraid || die
 
        # do not rely on /lib -> /libXX link