bump(sys-block/parted): sync with upstream for arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2015-06-16 14:15:18 -07:00
parent de815a2c33
commit 20b828ca84
8 changed files with 226 additions and 42 deletions

View File

@ -1,13 +1,14 @@
DEFINED_PHASES=configure install prepare test DEFINED_PHASES=configure install prepare
DEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig
DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
EAPI=3 EAPI=5
HOMEPAGE=http://www.gnu.org/software/parted HOMEPAGE=http://www.gnu.org/software/parted
IUSE=+debug device-mapper nls readline selinux static-libs IUSE=+debug device-mapper nls readline selinux static-libs
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
LICENSE=GPL-3 LICENSE=GPL-3
RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.2 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux )
RESTRICT=test
SLOT=0 SLOT=0
SRC_URI=mirror://gnu/parted/parted-2.4.tar.xz SRC_URI=mirror://gnu/parted/parted-2.4.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=5dc190b40e8a01e030bbbc4291534075 _md5_=06ec296c5e95b8a5c119042fddf0ea81

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare
DEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
EAPI=5
HOMEPAGE=http://www.gnu.org/software/parted
IUSE=+debug device-mapper nls readline selinux static-libs
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
LICENSE=GPL-3
RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux )
RESTRICT=test
SLOT=0
SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=e40d425de8cd98607d83c6808ae72206

View File

@ -1,6 +1,54 @@
# ChangeLog for sys-block/parted # ChangeLog for sys-block/parted
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.46 2014/03/04 00:25:41 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.60 2015/03/03 09:57:56 dlan Exp $
03 Mar 2015; Yixun Lan <dlan@gentoo.org> parted-3.2.ebuild:
add arm64 support, tested on A53 board
03 Jan 2015; Jeroen Roovers <jer@gentoo.org> parted-3.2.ebuild,
+files/parted-3.2-po4a-mandir.patch:
Fix deferred mandir definition using $(mandir) by Maksym Sditanov (bug
#534116).
04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for ppc64, wrt bug #527846
02 Dec 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for alpha, wrt bug #527846
23 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> parted-3.2.ebuild:
x86 stable wrt bug #527846
11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for ia64, wrt bug #527846
10 Nov 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for ppc, wrt bug #527846
08 Nov 2014; Markus Meier <maekke@gentoo.org> parted-3.2.ebuild:
arm stable, bug #527846
06 Nov 2014; Jeroen Roovers <jer@gentoo.org> parted-3.2.ebuild:
Stable for HPPA (bug #527846).
04 Nov 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild,
parted-3.2.ebuild:
Set RESTRICT=test (bug #276687).
04 Nov 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for sparc, wrt bug #527846
03 Nov 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
Stable for amd64, wrt bug #527846
29 Jul 2014; Jeroen Roovers <jer@gentoo.org> parted-3.2.ebuild:
Clean up ebuild.
*parted-3.2 (29 Jul 2014)
29 Jul 2014; Jeroen Roovers <jer@gentoo.org> +parted-3.2.ebuild,
+files/parted-3.2-devmapper.patch:
Version bump.
04 Mar 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild, 04 Mar 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild,
parted-3.1-r1.ebuild, +files/parted-2.4-readline.patch, parted-3.1-r1.ebuild, +files/parted-2.4-readline.patch,

View File

@ -5,16 +5,30 @@ AUX parted-2.4-no-gets.patch 343 SHA256 d9d984baa7b742e2201c34b36233dceeca5f97ce
AUX parted-2.4-readline.patch 340 SHA256 22ed598c1e56b0b11a8d238ca304e05d480a5eb25833098f617484909a4416bd SHA512 965a24fd7a9c21b65ce3b55618c127b102a6e0b3783b6ed020d032d3aa572d0323ff845b390e1cb6460ac089f308b7e18b875ada2aebb5e5e8726c4beb7a8da5 WHIRLPOOL 5077c7b9ef49661a4533845c66ad17295a1832cb3e7791cba8e762d592656a2614d3d794e4c89eda69e1f78810671e8c919b8af8bd85f00b3801a36608ec584c AUX parted-2.4-readline.patch 340 SHA256 22ed598c1e56b0b11a8d238ca304e05d480a5eb25833098f617484909a4416bd SHA512 965a24fd7a9c21b65ce3b55618c127b102a6e0b3783b6ed020d032d3aa572d0323ff845b390e1cb6460ac089f308b7e18b875ada2aebb5e5e8726c4beb7a8da5 WHIRLPOOL 5077c7b9ef49661a4533845c66ad17295a1832cb3e7791cba8e762d592656a2614d3d794e4c89eda69e1f78810671e8c919b8af8bd85f00b3801a36608ec584c
AUX parted-3.1-readline.patch 340 SHA256 a6ee5fd919a2a035309b70decce60514587a27d1603f361a48dbaf2757b8a8cc SHA512 a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 WHIRLPOOL bd494816afd1c0310848538233509212397d0add3b60579264a4ca2b00babcd2144b708318c26b5e2791787e439df18921e6fc521f931298ec96476f0179260c AUX parted-3.1-readline.patch 340 SHA256 a6ee5fd919a2a035309b70decce60514587a27d1603f361a48dbaf2757b8a8cc SHA512 a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 WHIRLPOOL bd494816afd1c0310848538233509212397d0add3b60579264a4ca2b00babcd2144b708318c26b5e2791787e439df18921e6fc521f931298ec96476f0179260c
AUX parted-3.1-zfs.patch 4767 SHA256 86dda57387dda83ca0380264cd8536c21cb59f91e83def29194b67e3ab07770c SHA512 2970595d4d507b5fddc3506430c5fa5f4778c493733879289e1ae6314442a29930b97acf3cdf1b1b0ff26c3c5d3b5bf4b1300a3a4ba35daf2d654a8c0d75863d WHIRLPOOL 74585b9a4f5553a7c8b3b2b6eb3871f8353ec1566dafbaea2010c995a6895f89330ff9593b58ee4bc119b7bcc4ed4f155bb279a426767031cfef70e66cd723d6 AUX parted-3.1-zfs.patch 4767 SHA256 86dda57387dda83ca0380264cd8536c21cb59f91e83def29194b67e3ab07770c SHA512 2970595d4d507b5fddc3506430c5fa5f4778c493733879289e1ae6314442a29930b97acf3cdf1b1b0ff26c3c5d3b5bf4b1300a3a4ba35daf2d654a8c0d75863d WHIRLPOOL 74585b9a4f5553a7c8b3b2b6eb3871f8353ec1566dafbaea2010c995a6895f89330ff9593b58ee4bc119b7bcc4ed4f155bb279a426767031cfef70e66cd723d6
AUX parted-3.2-devmapper.patch 1972 SHA256 a72db7a487b891b19e6b859a6deaa4defe0c603842f1a91962de553e68acc96f SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da WHIRLPOOL c0a16dce6f967b6d4d343bec9fe34c0803fdb231aa51abede4b94080db90af8be36d232f9d24246808a59be13be7635b520b0ec6c2cd82a99515c2ad0866f876
AUX parted-3.2-po4a-mandir.patch 275 SHA256 327ffc2ea942a58a63cf6dc21d041965ee76b3b7d4d01b36a0654dcb6b0a92ae SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 WHIRLPOOL 643013b78ebd6dbd93a60e7fc46215851bcd9d3166f0df308fa9d1a3927772cf1d63d2ba0da737983b3fbb0ff125f946d27662808e6233f6c60bdf4f7425898d
DIST parted-2.4.tar.xz 1516412 SHA256 508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 WHIRLPOOL 688a44c88ffd99523f17eb5c8722cf4ee09bd0af105ab45a7bd08050682345288182f90bbebf6fed8bdbb1a4deac965084a0f430ef6490d154671de58de50574 DIST parted-2.4.tar.xz 1516412 SHA256 508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 WHIRLPOOL 688a44c88ffd99523f17eb5c8722cf4ee09bd0af105ab45a7bd08050682345288182f90bbebf6fed8bdbb1a4deac965084a0f430ef6490d154671de58de50574
DIST parted-3.1.tar.xz 1524344 SHA256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 WHIRLPOOL 8e4c0b3f045405acbf5eab8d72d46450cb5c6adc50b9eba4ad4a9600da9ea203b412cf151d03782b045dc7f6232bd79ace85d01ce9d2faba458ee48b9df00de9 DIST parted-3.1.tar.xz 1524344 SHA256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 WHIRLPOOL 8e4c0b3f045405acbf5eab8d72d46450cb5c6adc50b9eba4ad4a9600da9ea203b412cf151d03782b045dc7f6232bd79ace85d01ce9d2faba458ee48b9df00de9
EBUILD parted-2.4.ebuild 2036 SHA256 bdbe3aff61ddfde6a35a6e5d38621aaf3cb34011f659e4787b75acd9d2f9723b SHA512 fbca6311d711aa4503ad79c57b2253333a3ac2d246fed4df036e571929737490177017604ca304bdd88837a137c268cb6df6108d14df31dfb2abdc013dd54792 WHIRLPOOL a34eda0a1d5e12bbc159ae38a325c3dcfda04f7b249a3d43723cf4f75cf1d689e711ca5f1a21f4ac6b0a34c48b87fd932891fb9bbfd6fc3a24b093493a3ed7c0 DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f
EBUILD parted-2.4.ebuild 1387 SHA256 59ae342e7bf71a6c4f7a7def76dd52c31091c0cf2d88689a04c2bdadcfe60345 SHA512 c77e75b495461654140ca4f140111f50c2850d903955d46cd646cafefae893c2f2fab36884b60d377f45fa843269d8ea2a53616f2574412616680ceca5c6fe07 WHIRLPOOL 98d0c4085923c1c20081220c83500428cf1ebebcc7168d584f3c93cd51f02a584efeeed36b2bb4fa79cfab538cce29a9ec29b97376033f59cbbad5c24daaae15
EBUILD parted-3.1-r1.ebuild 2207 SHA256 71d5c032cca8c270164b18e1b75e0503b253b7b0972844d28fcd4c4f2abc18b6 SHA512 93c42236684890341326850966031a59b15e305f99cd4852a238ca669c6800d5efee9be60ab5ce72d509ee305a6d4f75505749e38f1b8cd5c8938a661141431f WHIRLPOOL f018161c2b9a9a1cb2123f87f1997c5f8801861b79af206a37eaf198fbc091a8c88dbcd6a799929e4372a49b5cc100a79e102afb002d413b09e0297ef2b5ebc8 EBUILD parted-3.1-r1.ebuild 2207 SHA256 71d5c032cca8c270164b18e1b75e0503b253b7b0972844d28fcd4c4f2abc18b6 SHA512 93c42236684890341326850966031a59b15e305f99cd4852a238ca669c6800d5efee9be60ab5ce72d509ee305a6d4f75505749e38f1b8cd5c8938a661141431f WHIRLPOOL f018161c2b9a9a1cb2123f87f1997c5f8801861b79af206a37eaf198fbc091a8c88dbcd6a799929e4372a49b5cc100a79e102afb002d413b09e0297ef2b5ebc8
MISC ChangeLog 27993 SHA256 143b36de589117fba0bcb3656b5e7df800f188d5e840e1eecf0b8f2324d11bae SHA512 3d25f8713ada65083f616666e7691c20bcd72681af6af4badec990c2b506a23e7cda0f55af45687eeed5973da5601848719bb96c1d3efab7c2cc4cf56b025403 WHIRLPOOL 714fbc2b9987e2c7728ba809df6eda45358d159c616b74f2ee9b32a69b2f41a62d3a14f43eed97faf906248670997a387bb62987c8900a7226bcf5e9720a2cee EBUILD parted-3.2.ebuild 1417 SHA256 fa01ffa59dde136a2559257413973e488659f3c588d7483e384bb18bddf7db25 SHA512 a27b8c49c7203788b3c9ecc382661139e6124ee7f4e9dbc5de55773e163e654c1907e91addd2a38b5a0d8a8ef2ed47dc605f24ffad218c635b137378438b0343 WHIRLPOOL 1d92df7142c582046a5a93b8a1d58c032ecb740c8907ed7737c3671d0aa8fe6ce7128f2d332b46bc204066c02a01904a94faf7072d2c581302d1d19d5cd2c9a4
MISC ChangeLog 29566 SHA256 cefa05c5b9ec8320edd52f3a11bd69598f9cf6d115438987ebb7d8bb7c42d50a SHA512 2e9119b325726109f92efbba6c369da28270e597e20140de169f289e810e227eb67c74820f2f67a7b3ab47f8470822b32e8486f3caa82962e524bdc82d12cfaf WHIRLPOOL e0bd0963d7a1473ab424a5bb0f9d4406173858799d241ccc3099b94062b581124f3ebce9394280a91b7920f43165853842e870c8c91f6cccfee389e7747f0f59
MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux) Version: GnuPG v2
iEYEAREIAAYFAlMVHYYACgkQVWmRsqeSphOfXACdGiBEFW7PRnOs9zjxLjfGRi0s iQIcBAEBCAAGBQJU9RTIAAoJEJIMDbyqvv1V9rwP/jJ6Z2/alljjmoV6PSGnK1kU
HNAAn1TP9CbHRKUGZV/OBo6d3aNt6yW9 MbguUjn5f5vnPT+ePELgpLlPlmYZ6hd/CUzECZYQOyY1XEQ5iawIVPv0oDnWTCo/
=qaks O6r51HVcDQwpayjl47usMElKco6p1Df4WCg4mNbw4p30cYRaH1x2vBm/PsNkigyQ
92rx25WAjApQqD/KsVRcI218lhRUVBLy/6CsQuppTqAwJAdWr3LYaW+Q99zQCZHu
KIOyZ7A9BHpR/VRT/jISx0suyAyBQRdKQkqdvKjOtzMj7tsyOrel6tjTtsSuevfZ
hHcSsrhI0M3E9acuXjcQjVkKOyQVDAFhnbbw4jB1G4GHQzknQbn+9clkjblPRKJw
7pmTy6/NETmNomd3tymSKkWJ9u4hCI68cW+4AHENpak9JDfthYVSinOp0ueiYU2l
l9pdPA8EbNcASwiFoLhPaqmlVULYM3FeblGE2MVJukcDGhCukIjINvEj7yuGRI+G
G2i3geuJiuoE8g/L910/AtbE2Ws4lLqpGii8SAlCwyRCpGK5UoQxIn4ZVUl+npQd
kChavwWQqoPP0vxRQe6l/VZD4i7JdrsFqQNaxuU8hl+yc8mRyl8dOQX31fPzkP+D
rYypDQyEDqJKvQC5+age7zOVKA6k89EjoZC50EEzlgrVv0srGZZJStNOC9YH2/eX
FF0pZ+9L9xYW1EDmDQ2V
=FEvD
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

View File

@ -0,0 +1,60 @@
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -2304,6 +2304,7 @@
return r < 0 ? NULL : resultp;
}
+#ifdef ENABLE_DEVICE_MAPPER
static char *
dm_canonical_path (PedDevice const *dev)
{
@@ -2326,12 +2327,22 @@
err:
return NULL;
}
+#endif /* ENABLE_DEVICE_MAPPER */
static char*
_device_get_part_path (PedDevice const *dev, int num)
{
- char *devpath = (dev->type == PED_DEVICE_DM
- ? dm_canonical_path (dev) : dev->path);
+ char *devpath =
+#ifdef ENABLE_DEVICE_MAPPER
+ (
+ dev->type == PED_DEVICE_DM
+ ? dm_canonical_path (dev) :
+#endif /* ENABLE_DEVICE_MAPPER */
+ dev->path
+#ifdef ENABLE_DEVICE_MAPPER
+ )
+#endif /* ENABLE_DEVICE_MAPPER */
+ ;
size_t path_len = strlen (devpath);
char *result;
/* Check for devfs-style /disc => /partN transformation
@@ -2945,12 +2956,14 @@
unsigned long long *length);
+#ifdef ENABLE_DEVICE_MAPPER
if (disk->dev->type == PED_DEVICE_DM) {
add_partition = _dm_add_partition;
remove_partition = _dm_remove_partition;
resize_partition = _dm_resize_partition;
get_partition_start_and_length = _dm_get_partition_start_and_length;
} else {
+#endif /* ENABLE_DEVICE_MAPPER */
add_partition = _blkpg_add_partition;
remove_partition = _blkpg_remove_partition;
#ifdef BLKPG_RESIZE_PARTITION
@@ -2959,7 +2972,9 @@
resize_partition = NULL;
#endif
get_partition_start_and_length = _kernel_get_partition_start_and_length;
+#ifdef ENABLE_DEVICE_MAPPER
}
+#endif /* ENABLE_DEVICE_MAPPER */
/* lpn = largest partition number.
* for remove pass, use greater of device or label limit */

View File

@ -0,0 +1,11 @@
--- a/doc/po4a.mk
+++ b/doc/po4a.mk
@@ -23,7 +23,7 @@
# threshold is 80%), it won't be distributed, and the build won't fail.
#
-mandir = $(mandir)/$(lang)
+mandir := $(mandir)/$(lang)
# Inform automake that we want to install some man pages in section 1, 5
# and 8.

View File

@ -1,10 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.18 2014/03/04 00:25:40 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.19 2014/11/04 09:41:40 jer Exp $
EAPI="3" EAPI=5
inherit eutils
inherit autotools eutils
DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
HOMEPAGE="http://www.gnu.org/software/parted" HOMEPAGE="http://www.gnu.org/software/parted"
@ -14,6 +13,7 @@ LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
IUSE="+debug device-mapper nls readline selinux static-libs" IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
# specific version for gettext needed # specific version for gettext needed
# to fix bug 85999 # to fix bug 85999
@ -33,16 +33,6 @@ DEPEND="
src_prepare() { src_prepare() {
epatch "${FILESDIR}"/${P}-no-gets.patch epatch "${FILESDIR}"/${P}-no-gets.patch
epatch "${FILESDIR}"/${P}-readline.patch epatch "${FILESDIR}"/${P}-readline.patch
# Remove tests known to FAIL instead of SKIP without OS/userland support
sed -i libparted/tests/Makefile.am \
-e 's|t3000-symlink.sh||g' || die "sed failed"
sed -i tests/Makefile.am \
-e '/t4100-msdos-partition-limits.sh/d' \
-e '/t4100-dvh-partition-limits.sh/d' \
-e '/t6000-dm.sh/d' || die "sed failed"
eautoreconf
} }
src_configure() { src_configure() {
@ -55,23 +45,12 @@ src_configure() {
$(use_with readline) \ $(use_with readline) \
--disable-Werror \ --disable-Werror \
--disable-rpath \ --disable-rpath \
--disable-silent-rules \ --disable-silent-rules
|| die
} }
src_test() { DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
if use debug; then
# Do not die when tests fail - some requirements are not
# properly checked and should not lead to the ebuild failing.
emake check
else
ewarn "Skipping tests because USE=-debug is set."
fi
}
src_install() { src_install() {
emake install DESTDIR="${D}" || die "Install failed" default
dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO prune_libtool_files
dodoc doc/{API,FAT,USER.jp}
find "${ED}" -name '*.la' -exec rm -f '{}' +
} }

View File

@ -0,0 +1,57 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.14 2015/03/03 09:57:56 dlan Exp $
EAPI=5
inherit autotools eutils
DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
HOMEPAGE="http://www.gnu.org/software/parted"
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"
# specific version for gettext needed
# to fix bug 85999
RDEPEND="
>=sys-fs/e2fsprogs-1.27
>=sys-libs/ncurses-5.7-r7
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
readline? ( >=sys-libs/readline-5.2 )
selinux? ( sys-libs/libselinux )
"
DEPEND="
${RDEPEND}
nls? ( >=sys-devel/gettext-0.12.1-r2 )
virtual/pkgconfig
"
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
eautoreconf
}
src_configure() {
econf \
$(use_enable debug) \
$(use_enable device-mapper) \
$(use_enable nls) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_with readline) \
--disable-rpath \
--disable-silent-rules
}
DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
src_install() {
default
prune_libtool_files
}