sys-apps/gptfdisk: Version BUmp and make icu support optional, #428410, #461454

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 90 insertions, 25 deletions

diff --git a/sys-apps/gptfdisk/ChangeLog b/sys-apps/gptfdisk/ChangeLog
index 4b21a10327da..b860094aa660 100644
--- a/sys-apps/gptfdisk/ChangeLog
+++ b/sys-apps/gptfdisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/gptfdisk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.25 2013/03/09 19:37:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.26 2013/03/29 16:44:20 jlec Exp $
+
+*gptfdisk-0.8.6 (29 Mar 2013)
+
+  29 Mar 2013; Justin Lecher <jlec@gentoo.org> gptfdisk-0.8.4.ebuild,
+  gptfdisk-0.8.5.ebuild, +gptfdisk-0.8.6.ebuild, metadata.xml:
+  Version BUmp and make icu support optional, #428410, #461454
 
   09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> gptfdisk-0.8.5.ebuild:
   Stable for sparc, wrt bug #427550
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 930606e31815..072f237017f4 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -3,24 +3,16 @@ Hash: SHA512
 
 DIST gptfdisk-0.8.4.tar.gz 183081 SHA256 a4aa6800df3a43bec2900eff3c2d8488d8d60c06833035bc881237f9acb79b85 SHA512 604d395a5225e415fddbaa1c6c14ab2867f625e540e9353178698c4dafe7515bedf181b3551e0eb334681fc27a7ed815fb38da3bed81ea1bfdb5c6cadcd3be44 WHIRLPOOL 6654b2cbebd13c215be8d8c0472218d577008a074e377d6cab298a2934166bc2f9a246a90a047e50039d9dc1c013d9af5690c6c426c9c5a16e69200e2c7606b2
 DIST gptfdisk-0.8.5.tar.gz 183841 SHA256 15cc691f28212c157e05315662ed6b76ffdcc8de6fc118fa21c81ef5aae84af9 SHA512 d16038507bc5f0f5dd17888fb1508c9bd92d51d80e4a842d4868b4da3ed8799c96b66d21a68f58e5d94b69a7e5717b7c8985a44d51b16bcfbe9c992f5f79d2ad WHIRLPOOL 9343060ce5b41d5ae8c457b8c4930d4babbf32fd9f9f69cdbb445302f163dbf7f16182febfa9321f806982fd2f29cfafaa2242e896385620375a456311b1b15c
-EBUILD gptfdisk-0.8.4.ebuild 767 SHA256 c1025581002c426e7d16770037ea0aa05a8bad159f2de5de118194ad9bc11ae0 SHA512 3f620027d8ba571c5dbe0b541aecd6e7a4035ee9210aee1aebd49bde48938bd533e573f5a13b891d32a802222b9bd2b8ab207400e7bcc95a76445ba5aa658e45 WHIRLPOOL e11541003b588360ebdb514a18e10691a543a5b85f3e07a6dab7e3504ee39d6d580eadb6693dbaca82a5d66094a0e8f20922cd8de40b18d11e29a831e36760b3
-EBUILD gptfdisk-0.8.5.ebuild 1003 SHA256 2ed76f2d423addfa0278e8d459c8a2b4c44b2a1f2cdbeb923543df0834da6a1d SHA512 b182c6ecd762cb528736bb1749225051cb9944478e3a9aadd49bfef96f4281d8721eb4b52acb90c1ebea4ff6a92d40f5c35c1993b599081c848768c5b6daeee9 WHIRLPOOL 6f5ec455148cad16495f458482fd6a2342c41c9b2a9926fef06b0adbc712229f0d457d1b5c443f24f5086efb1eecd41ed83dc602eb9b2620edb1e4878ae6aede
-MISC ChangeLog 5358 SHA256 e8465bff0e171609e571412a7328217a33d1e9bae5f34e8de15b6927078a27dc SHA512 a6cc2b32d6ada0c1a7e90e0f8ec55377877f2eea12b2182236e1c55393e9869f7a74727762fe4782841bf4dcd3d90ae7f57e85160e2440a70b97a7448784493e WHIRLPOOL 9b72e0aa6ff770fc93d8c0acccfb3e04ecb134ead0fc21a1a188e246d924f0e0b2d9dd820ad8854b23133d984c62f9b2fafb95844e0bbd4de1c5932eb9fc585b
-MISC metadata.xml 234 SHA256 f8bed758fd06390499b50d7d444ade068333403da266d807e23647ff9874165f SHA512 08eca96796bafb776d063f6ea32c7b33a889e199c751556dedef5542a3627995156f31ea56cc3b3352dd8c185ce57d03d89720a4eb6d0ed7154412cb3661063c WHIRLPOOL c9e73c44c14faa1ae7693aaa7a05d1d2176bfc33bdf039dc6ed0788b5f428571c5d547ef97e261b6cf30efff277f39077bf904f8cc5a39e332deb6c111b910bc
+DIST gptfdisk-0.8.6.tar.gz 184686 SHA256 4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2 SHA512 ad73e644c664f04524e984d1ab39f006f49c3bd62529ecb982f0dd09ba6aeeeee3f146e22398e03e7fabf25eabe7506ff1db35e90863b3494fdd54a5262d9800 WHIRLPOOL 37253eda2f040c15e5b66ffe243c5b961737733562f57f4e9bcc2dd94c55c1adc9274f4c2db03bd3c817ccd83abb503b4ec5dfb78cb8afc910078fecfd9fe4dd
+EBUILD gptfdisk-0.8.4.ebuild 918 SHA256 a0805f4b511a39cce4ec03a916ff9686ca7e24589786f1e43e683552d7f4053c SHA512 95e095e62ae9262fd5965fe2202ee269d0864e3fa714f0a9ab3549763a0e41d0856b5883ef26b634844ceba875dfc3d4464a1edee00dd802f1b0fe084756ce3b WHIRLPOOL aad8f03391c2a066661f767c125586c52afb2600a571ab2cdaf01363f579fdda7da6781a04274841df6cee3c163f67f871fbb1c0f9f8092d009ea29080a4e8bc
+EBUILD gptfdisk-0.8.5.ebuild 1151 SHA256 982c7d855cb594d77c45f9a5771729e8ba5f4ca5cc37882f77466d092cae1132 SHA512 ff3e40d414c85240da3a43d39b344cfdcea185e55b478b24df9c62f54104b48989ad5f63ee5c016ebd50ebe78db8f662c855f43b5b66d62edf1de4c1bc9831b9 WHIRLPOOL b971b1111a8bc072a3c50096a060295d549cad38c07532995c5b121362fc13e5a8b96c36459c9c289378f843d8141107a1d3bd5b31dbdb458ea1b721941796d4
+EBUILD gptfdisk-0.8.6.ebuild 1175 SHA256 6df5e1bfdb4535691e391356228dec515f9941d44ce13ad9e616ab11b7843ac2 SHA512 dda3dcbfa8913cd415ef5df87a362339351af1870950118dfdc890ff800dbfc88c66d361fcad2d13c5a76f2614f4b004eb1073d36cc0fcb28a8dbe72b24d1aae WHIRLPOOL 96464a75ea87b98d4acbd96c1750868f3545e12ab840dbd02ea1fd2d5c27b9acf07da9a0f521f6613a699bd6966d26ce427a7ef9f9537d7ae33934f1ddca12c8
+MISC ChangeLog 5587 SHA256 1b3bbcb1202aa4c71510037e13d50004c6815aa12aa7e1347cbcf7e41436144c SHA512 2b72b9bf39ae857398d4e04d2dd2ac1756dee36f82f1911584b8ece0a9bda8ac8c0535ea17aa801c01d0597ba0600364d593a9a5a136605864504517b49e26de WHIRLPOOL 3967dc387c044a844491cd3e38ad7ba303a3c18524f480e0f398375878c572fef2d8934f937722b6ea28ac2ef0f7ef4d3127fc3d15e26682f31c540b1249dc29
+MISC metadata.xml 240 SHA256 f70cde052604926c6ac9b19b6091c308671b91300b1d1d0537f4d590f59d2d90 SHA512 dc32e8e7c987cea9fea95968f1f0d86c6450bba42f3d91c193db041c52f96db23070bc89bb86b212ea4a3bd0844e293daac612661d4e7af26c0c786f671e80f0 WHIRLPOOL 52ed6b39c492f28032bcb2bb024141fc009add45d870ba97ba670c9be2565f7b8171804d7cbf0687673a72c43e7efd143a31fcb14b9ac771ddc2afedf2efd200
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRO47rAAoJELp701BxlEWfwxkQAJnRyzyl9i5Yld7ne/oqIZVx
-IiTzVQ71miZDFFnNFlUID3h8rGXT+ZCs4hS/aCbr2DbLZq8LpAHvWPkqvPl6LZ4G
-Au/WpvVnxQW3O9PBUrRRUiGShTBvd3WqOwucUVihXEj2encOAyKd2BZ2sWx01od3
-JEMZFE5TAzpQL/jJCqhh/GPUCiMgXRwZDdfVQSnuYI1GX6+c1r+zFSlB+YuGAJAr
-SwqOnQBbuS+KmCyIbr4bYArOtxuykaTz9LGIaRdc+Qi4A5AxHAJfXtcx0xvQkCE9
-PBeFHDpFPDjS1HivoxbjZUXsGtI8OrXiJP+xa7lG23ZWbqZmOKDtaEwjM7V7Y2zN
-2T7sIACweeRokCoDSWxZK8/hqtTiQvBj6Rjl8jacSNgPTYzpJKG7G+r6VExosbfK
-/Ln5JWz7RVPzKSAalU5BBxBLE1tBFJmQ7P6Xf8NTqu7HqsEVlh9WEoozv/ZVOSkv
-4YgIwSB7vCDZ8+1yzsKF9ezg08T98lqBnrLJBcdhKV+uwg7xSCoBiXyNANE5Dups
-quuE3cU4IoDXC5btoU7I6hvphLn40mamouRvgaDxstaLfSdusMRAMA7G9mH6gMlz
-XP3o4l+gT+/nB3LqIuqHYuI3GrU6ZUymwTyZBfxSD18YfW8OR6ZG3QAi31IJP6al
-Ak1dnVZHtKMl7buuX1lP
-=2/9e
+iEYEAREKAAYFAlFVxOYACgkQgAnW8HDreRYJJwCgis+OV5bh+dnlgcNhxx9e3hJ1
+QVMAn0Hi76PnHO5jOB7MW5wlrkR2tniB
+=5Hfr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
index f63897cd5e12..5ee38034bc50 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild,v 1.9 2013/01/20 13:18:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild,v 1.10 2013/03/29 16:44:20 jlec Exp $
 
 EAPI=4
 
@@ -15,11 +15,21 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="dev-libs/icu
+RDEPEND="
+	dev-libs/icu
 	dev-libs/popt
 	sys-libs/ncurses"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+
+	tc-export CXX
+}
+
 src_compile() {
 	emake CXX="$(tc-getCXX)"
 }
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild
index d176582dca79..93ec7ed12486 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild,v 1.8 2013/03/09 19:37:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild,v 1.9 2013/03/29 16:44:20 jlec Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -21,6 +21,15 @@ RDEPEND="dev-libs/icu
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+
+	tc-export CXX
+}
+
 src_compile() {
 	emake CXX="$(tc-getCXX) $($(tc-getPKG_CONFIG) --variable=CXXFLAGS icu-io icu-uc) ${CXXFLAGS}" #439696
 }
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
new file mode 100644
index 000000000000..036301c1b589
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.1 2013/03/29 16:44:20 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="http://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="kernel_linux +icu"
+
+RDEPEND="
+	dev-libs/popt
+	>=sys-libs/ncurses-5.7-r7
+	icu? ( dev-libs/icu )
+	kernel_linux? ( sys-apps/util-linux )" # libuuid
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	if ! use icu; then
+		sed \
+			-e 's:-licuio::g' \
+			-e 's:-licuuc::g' \
+			-e 's:-D USE_UTF16::g' \
+			-i Makefile || die
+		append-cxxflags $($(tc-getPKG_CONFIG) --variable=CXXFLAGS icu-io icu-uc)
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+
+	tc-export CXX
+}
+
+src_install() {
+	dosbin gdisk sgdisk cgdisk fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/gptfdisk/metadata.xml b/sys-apps/gptfdisk/metadata.xml
index 247f45889c01..f233055c02bb 100644
--- a/sys-apps/gptfdisk/metadata.xml
+++ b/sys-apps/gptfdisk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
+  <maintainer>
+    <email>alexxy@gentoo.org</email>
+    <name>Alexey Shvetsov</name>
+  </maintainer>
 </pkgmetadata>