Fix the build. See ChangeLog for more.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 25 insertions, 11 deletions

diff --git a/sys-apps/gptfdisk/ChangeLog b/sys-apps/gptfdisk/ChangeLog
index d50ff87c47d9..df56865822e5 100644
--- a/sys-apps/gptfdisk/ChangeLog
+++ b/sys-apps/gptfdisk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gptfdisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.18 2012/09/29 16:44:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.19 2012/11/04 07:48:22 ssuominen Exp $
+
+  04 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> gptfdisk-0.8.5.ebuild:
+  Read variable CXXFLAGS from icu-{io,uc}.pc pkg-config files wrt #439696 by
+  Alphat-PC
 
   29 Sep 2012; Raúl Porcel <armin76@gentoo.org> gptfdisk-0.8.4.ebuild,
   gptfdisk-0.8.5.ebuild:
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index a90d61e68e0f..c8d082ad7ec9 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -4,13 +4,17 @@ Hash: SHA256
 DIST gptfdisk-0.8.4.tar.gz 183081 SHA256 a4aa6800df3a43bec2900eff3c2d8488d8d60c06833035bc881237f9acb79b85
 DIST gptfdisk-0.8.5.tar.gz 183841 SHA256 15cc691f28212c157e05315662ed6b76ffdcc8de6fc118fa21c81ef5aae84af9 SHA512 d16038507bc5f0f5dd17888fb1508c9bd92d51d80e4a842d4868b4da3ed8799c96b66d21a68f58e5d94b69a7e5717b7c8985a44d51b16bcfbe9c992f5f79d2ad WHIRLPOOL 9343060ce5b41d5ae8c457b8c4930d4babbf32fd9f9f69cdbb445302f163dbf7f16182febfa9321f806982fd2f29cfafaa2242e896385620375a456311b1b15c
 EBUILD gptfdisk-0.8.4.ebuild 772 SHA256 e396d439845f855715bc656676cc0adec7620681d749609cc06c1d5227864caf SHA512 28466196f4d63442b49289520ab2ba63fc52f068772a49a2196a491c0007e91e676c6d3a055190355165610e9056eb9f9bdbecb61c638806edde4be66e4a3708 WHIRLPOOL e56e030f10498fe03f8b8e9cc5e17323349858f876d38e786ad835770c3263a7572a446f25ba2d0a3f672a85bfca4189e1a8cb27ee230b95d489b0590073d22b
-EBUILD gptfdisk-0.8.5.ebuild 792 SHA256 e65d37c6da01597b5b4abce8227e175ce372c82f2d285297c21e3461b8cb2d4c SHA512 691f1db83a71a8412893f4de769590a886d31d1e4ebbc420577c64f44621f56efd0a1a1157b1bf872abd8726a43fd5439f54015cc43aa0e41ab4da4290c224a6 WHIRLPOOL ab82d5e63050b715f04bfaeb99a837dc2eb7103aedc27b77f552fb07131c2a88ce5678ace7e568186938d021828ef52c2044c1001cbf0ff1a9c5156439f6d928
-MISC ChangeLog 4563 SHA256 60766499f0197a22d1f7e0506ea3e055eba23b0e0770f99993ce7a883beb4e2a SHA512 99e5fdd602431108e7ba85dc999275b14948150730bc1ff1f65a560557c1c16fa85af99d33bfcf42acb740e44d678fbc3cfe4a10868ecc583c81d9acd585e05f WHIRLPOOL f4ac76eb71c9d94ed98424bf4f378744ccab5b7a68f61cc5baafae142e3e4f3387d6f636519d7c93ee736bfe6329b6abd50efcac1be5f94d9a2879e9c7efdfcc
+EBUILD gptfdisk-0.8.5.ebuild 994 SHA256 b01a33f245b542b1e57048bd87a69439b60f86ad6c294fcab50fc1be241851f2 SHA512 4e81946f44128020c6b9c31f379ced752f946ab14425b6e1598beab4a9fcbcd8b499bd09d599b11a7d2095b399eea6f3e2535c634c81fdd6a5393175b2c9594a WHIRLPOOL 3e9bbf3123ac27ccce8789b1a634e783c0fe18aa64c012e881b081fa5efabafc1b6a728dccf42ef29d96a2c3922f5c3bf6a16f0afa72dcb22d8ffe1e0eb6f3c6
+MISC ChangeLog 4732 SHA256 51bf34d74f26e37ed5a12c5323fca425f3f699b3a1773b5823ed699c5f9c8606 SHA512 b80c4e02f0c091e5168b66eef7e99d242e84dd46bdb4bc7f1ff8218758aab186ca8a5fa49c3651b5c1a028bfde3b3d3fa4ff48808e14f4f07f8e3db01c3258fe WHIRLPOOL 4816decf187d14034c3b136e0d610ae6d703314899891e529e67179d52eea4a1d671d46b1f7d3503b32727b8b4a057eeaa0e7248e6efef70f9438ab9eb10fddc
 MISC metadata.xml 234 SHA256 f8bed758fd06390499b50d7d444ade068333403da266d807e23647ff9874165f SHA512 08eca96796bafb776d063f6ea32c7b33a889e199c751556dedef5542a3627995156f31ea56cc3b3352dd8c185ce57d03d89720a4eb6d0ed7154412cb3661063c WHIRLPOOL c9e73c44c14faa1ae7693aaa7a05d1d2176bfc33bdf039dc6ed0788b5f428571c5d547ef97e261b6cf30efff277f39077bf904f8cc5a39e332deb6c111b910bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBnJXUACgkQuQc30/atMkA6sgCgmz4PRxF8LOQ1slVfJboFJE/6
-zyQAoMBbjRAZglLHaLmsMTUZQZxPfwQP
-=OrOy
+iQEcBAEBCAAGBQJQlhyaAAoJEEdUh39IaPFNk4sH/0di5fHquWBU1E11H0Dppjkw
+ZYk+RGhv4dtvxq6Nvidqlh04ypeApgXU8AbuyUBA6OozRrKTp1JUDe7y0oc/PMXn
+L7sNK/nCGX5Peue6LbhBpsEIQI4FFeH7ItEJzWNaoqbpqjnnYc5T3uYnpxMTLYRS
+DJNuuE0JNUj6C/aqJmuhtE7KlFHP3OhE0S5AFG1rki9msCKlfVrFricI7ugztgh7
+FlqU0PbdcA+lz7BjOrEIKdVWGDVq7qd7njKJKl2hjmO2Dgj4dGfE4yO6nYz9RY4k
+uekXzTIdwaYlBu3hwKpcp553drwmpFCKrv5wLVzqYAfTKtQ7Adwp9gbpiDFPOJc=
+=5FCW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild
index 84c974ba5546..7476a1c6db93 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-2012 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.2 2012/09/29 16:44:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild,v 1.3 2012/11/04 07:48:23 ssuominen Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -12,17 +12,23 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="kernel_linux"
 
 RDEPEND="dev-libs/icu
 	dev-libs/popt
-	>=sys-libs/ncurses-5.7-r7"
-DEPEND="${RDEPEND}"
+	>=sys-libs/ncurses-5.7-r7
+	kernel_linux? ( sys-apps/util-linux )" # libuuid
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_compile() {
-	emake CXX="$(tc-getCXX)"
+	emake CXX="$(tc-getCXX) $($(tc-getPKG_CONFIG) --variable=CXXFLAGS icu-io icu-uc) ${CXXFLAGS}" #439696
 }
 
+#src_test() {
+#	./gdisk_test.sh || die
+#}
+
 src_install() {
 	local app
 	for app in gdisk sgdisk cgdisk fixparts; do