Revision bump to fix bug#441794 and more wip goodies.

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

3 files changed, 60 insertions, 54 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 425a2ffbe901..71ed0ffc3424 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.214 2012/11/04 12:26:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.215 2012/11/05 11:56:17 scarabeus Exp $
+
+*icu-50_rc-r3 (05 Nov 2012)
+
+  05 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +icu-50_rc-r3.ebuild,
+  -icu-50_rc-r2.ebuild:
+  Revision bump to fix bug#441794 and more wip goodies.
 
   04 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> icu-50_rc-r2.ebuild:
   Silence repoman.
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 6047b6052350..ac841edd4a68 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -6,26 +6,25 @@ AUX icu-4.8.1.1-fix_ltr.patch 2175 SHA256 ecef8b305a8ab43c9164a2aaa39b3509e04200
 AUX icu-49.1.2-platforms.patch 2368 SHA256 e90a4c2c11b25fd511a754b4c8f7b2a491f75bd7a72dc03fc1c8821f6c8fe004 SHA512 30266ed021df921e4c502ec453e842c9aec607281dcd542a76680c0be72724a0c596542043580d96ae4098f7b08cb42827757d630cb6e12aaea0d1e034104891 WHIRLPOOL 2ff2499d6306db27866487a90014e330d7bda25fb671aa6dd238130d2255f1551a2337270a20731ea9fcf5ce15914c9cc939ca76e30aac246c807495ba439883
 DIST icu4c-49_1_2-docs.zip 4245617 SHA256 50fcc81a797b20ebaf12167479f24eac323bad21d012ca366701f62eccdabb94 SHA512 84ddc1e4cc3e4617e6a93c6ada3e7e5fa470fb34fed3ca4e3c57a741bbdd279d402d3fd313543230f2c73c3197300311eafd2d91c207ff64d3eca9833907a32b WHIRLPOOL 44fde7cfc560bb29e16f32ab4ca300c87469747719ba5a0e0622ed5eb64911e5f5969328a9cef71f0c4aee455093233d0a5c0f8719559d705c2698de2f457662
 DIST icu4c-49_1_2-src.tgz 19010646 SHA256 cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 SHA512 83997878222ada25be281c35b766906a9997da350068d4f7400874ea37133baeef0e8277dc117219c37ab486b643125b4b73ace956507d2237c1c9002173a140 WHIRLPOOL 68ff12ab0b3b5e471ced5d07c7170494e24526591587669b86a2a732ce3d0dda4abd74e2dcfdc3dd2e66a30b28d897836a6b0c1f1148101e1b51ffc87a87f080
-DIST icu4c-50_rc-docs.zip 6125408 SHA256 7e09e7481bfb12e3a84ebf4bf46afad986f8fae49cdef79deb5ae95fdc458800 SHA512 c367921082346812c0cae94d2f805e83814d68ee46256e736d5225ea5c71e1625b15f4b25064482750b2432d591123439c0ca00e929f5dae1895ba971db45d0e WHIRLPOOL 50ee21358efc355269abd9d173e0c9b203e4a33174e9a6956c3121128a12113bf09aba832c756f2c4c011e517fb3ce31563996a9286306bbcac87f4936cfafe7
 DIST icu4c-50_rc-src.tgz 19637660 SHA256 1336b0da4e862fc9b5d40c93c1a9be61aff635d9b743b5138176619409e6bb0b SHA512 be6dd349134a13848e4ff005c045db456a365212c558f38e0f371aa376e69f1044ff010308923c9542ec2ba3edba5521907e2a0dbb9e53f65d4dbe340aa2a019 WHIRLPOOL e71f3d8da84ff8b0d31df6b3b11cb065e366e9a4b8387411c75d4114c31533682867811b178c19c78c2670818b733db9489aff43ee4b377031aca6687a26359a
 EBUILD icu-49.1.2.ebuild 2303 SHA256 22b5fcfce6d5f8708fd606622648923b5146ac20d7e802af7c09aa8b2b9f6721 SHA512 02dcb2f28b89d09373518a86ec922831f52954ebe1846ca235e57db6cda3201df126ee5a13cb6597d0ffec762232d3ee33a360cb7f958a5de56a9823a729c965 WHIRLPOOL 54be9b6e9c912e7c193be83c2f20b3dd0f98b3d54961733a3622c7c314d51ae157f542c9ff996d46eeeba1b10f1167fc996e82576af2f8ebf242f6b9e27617da
-EBUILD icu-50_rc-r2.ebuild 2952 SHA256 957821a005b44fff21fafa8896f5cf3639a75179c3d01f3832aab0b16930f3ae SHA512 76e4be7d8e2fc33c872281ea9a550616f5db9eff8611e26f6d1dd7fd0e954865dfb85bee304a2d5deae493a4184cc15ae866eb966baad0ca0d75ec19aabe245a WHIRLPOOL d82d339719c54430cc9941d800862f4ecb4487680ca57bf2936750363a7d075f038e92e7f79880cffec1e43b435a9a787088865421de302488ec36a0eaf84a63
-MISC ChangeLog 27085 SHA256 fd19299111206cdd62e1ea61549bf2188652f93718d502e86aa61c15d73d6a9c SHA512 4ec33fb048a9a003c83e452e816a6fa7df277eaeab43ce277f439bb700d784e4747dbbd0824bae9d0c756e365dabfef8f199f96ae640a250b65ae44fcee91fd5 WHIRLPOOL 23cfb7dfa979887a8f640683a0cfb997b28d2685748aadbe5b0d4b1aae7bd634a0a3aee18a4457635f6e6e76155b9cd4188995d81cabd052007aa75f629bab5e
+EBUILD icu-50_rc-r3.ebuild 2878 SHA256 2e0156e90464637f0f19880e915d4c88ccfcf7dc2fe03a02d59df363e74cfd03 SHA512 f9bc14282c246bc6f758c1551bd9b8229620ca81dcffac966f296c91cd0c2cb5f2bc41e82cc064038f9e508945783add38ed7fba9fad9240b8329c307c9e8211 WHIRLPOOL 150321708bf8099c6c397a4fb7d4120533394ec2c2fa2a4aaa16f3f3fd68a0f91acd16455285cffa2ee67cad44382bf71e8a0e710625d3ba98da1a310794ef27
+MISC ChangeLog 27272 SHA256 70153fa8abb9efb20bacb2cb9e31c2bc99635910d3d9d72dea22793a51d4de3f SHA512 84426fc34266c275292e71c8d5723c559d93699f1e089080651928322c4f6c4caefd9c3f4061a7646f8a9ff307456844a5ad10027129a84e238d4fe4fb545d6c WHIRLPOOL b8c452025d7fb56e4fec318f14ebfcbb8a23b0d2844d03c527c09534b7bab84cb2a4a337d819c88614216dd5708bfe47eec9489cedffad9b04029abdc94cefc6
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQll7tAAoJEOSiRoyO7jvoFGUP/im8usqWElMxUU4VT8/Z458A
-50tExdkAiR98X+0z4qHr3hOv5zgQm/b5nH+ZGI7dYtNqbnlwhfo5G1OiKKKcSpzz
-xVvS9FmAMXkdwBiCW1WDFBdEyVZPB3CLA5rgWtLjwQH+OXqJQToH+9ivdCyC7mRf
-PIshcpry69ukJzpCortdwvNjNLM+DyB+2R/HYTLkOZS2gJvBAb5rYnuLGy/LXtJh
-OnalUWIl2fw8gL45Aauuwetq+DQE4Eb20PGTpUAnA6lVMNAFLudMsSppXVj4SpBU
-gpOs/NTXkRkRINzHcJzxombI6wxTprHCv7Ojk5CgBslTdkXQwbgkE1MHg85AOLOW
-fE/yb53laQUd7qnA9KSPD2+Li3gC5mCy62ZYES+ca2kOLtfC6PTklPWMdhw0HF6z
-CSpeeloD2+bJQmS5RPLueq8OyqkdDkX50Q5CGem0l47D2SYOODPA4MoV1G3HBlX+
-jJIoJpkB+MrBAWxKSMa6Mu9gwBesrG699KRJ5EUEG1DdWaw+EAcoXWaznOl3Hi/q
-6Zerqg3A7uyhxcuFdf8BaoQxPmUY7UvdIJ5qMJJBYxacXfiy2OnQ6ioA0NRbPNJJ
-fsXopa2gVK2gW9hTlyw+w9JaoLafito3y6b5mlEC5/u870t4uCwVITvdqxj3fGPW
-CaZ5ZJnpZ4sPaqOI6X/d
-=T7I/
+iQIcBAEBCAAGBQJQl6k7AAoJEOSiRoyO7jvoRCYP/2eTOF8ziXTyiHQD6UXah6m7
+pCdopj1wqiG4EGzzVqN2BOeAE1HmDngn1Ugv1JJjMIhSZNvGNrGuhmUXLWxEuxQ+
+jHIHryqHcQxRWmP3Y5y1M4AZgAL6yMdnRvAzt0Nb/iQI9A8G8/lkEUVILslcdAY6
+SX7SXIHg09EtSs0yUCKGKZumEdCePmZA6u89C+nZmU9s3MDmqS/NrqfhRbDNJ6ZY
+NiZ3gTXGzXTEsd/lJ3qx3v/CmTZIQlWWj9ypb/OhHtsE+n5s4/QhoxnubB9/rd9T
+pza80//ercY1tryXrhSzigl8kGtSAR636EVWkDjA/jeTJcmAZqZvOgtUmGG3muoG
+2JtaDjPwAvJz2xxQZTehFO1/qQAM4f+3HRJ9MRKjWJQeL+y3/f/T1vvSg8mH9Tki
+i29q8J8E3vDi6i+y2A0E7pDTXZsNz9vH3Hu0t3Nmc9+LpXRg1pT5CP43kh3jLKAu
+VeEswuFV1wyqspsQinBn5VGI+lBanKf0/2pSZjrcEFCUEh1NWnsN6Pfc3GPAeT22
+qSz6UF58ZXMEQm32CGQq3fxtQkTMRkwu6OfZQh/OILThWRsN5hTu5Spm6asjBh8U
+bfi3/ioQHGeo8HuwfEpF7FAZVrWUkGFueCJadmvKzOsLazrRydz8nM4I1pJQW6qr
+zZBbb1Gkldnsh+NMfVun
+=8+AD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/icu-50_rc-r2.ebuild b/dev-libs/icu/icu-50_rc-r3.ebuild
index df90feb879cc..578cd107ff32 100644
--- a/dev-libs/icu/icu-50_rc-r2.ebuild
+++ b/dev-libs/icu/icu-50_rc-r3.ebuild
@@ -1,56 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50_rc-r2.ebuild,v 1.2 2012/11/04 12:26:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50_rc-r3.ebuild,v 1.1 2012/11/05 11:56:17 scarabeus Exp $
 
 EAPI=5
 
-BASE_URI="http://download.icu-project.org/files/icu4c/${PV/_/}"
-SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz"
-DOCS_ARCHIVE="icu4c-${PV//./_}-docs.zip"
-
-inherit eutils toolchain-funcs versionator base
-
-MAJOR_VERSION="$(get_version_component_range 1)"
-if [[ ${PV/_rc/} != ${PV} ]]; then
-	MINOR_VERSION="1"
-else
-	MINOR_VERSION="$(get_version_component_range 2)"
-fi
+inherit eutils toolchain-funcs base autotools
 
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
-
-SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
-	doc? ( ${BASE_URI}/${DOCS_ARCHIVE} )
-"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
-DEPEND="doc? ( app-arch/unzip )"
 RDEPEND="!dev-libs/icu:0/50"
+DEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
 
 S="${WORKDIR}/${PN}/source"
 
-QA_DT_NEEDED="/usr/lib.*/libicudata\.so\.${MAJOR_VERSION}\.${MINOR_VERSION}.*"
-QA_FLAGS_IGNORED="/usr/lib.*/libicudata\.so\.${MAJOR_VERSION}\.${MINOR_VERSION}.*"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
 	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
 )
 
-src_unpack() {
-	unpack "${SRC_ARCHIVE}"
-	if use doc; then
-		mkdir -p docs
-		cd docs
-		unpack "${DOCS_ARCHIVE}"
-	fi
-}
-
 src_prepare() {
 	local variable
 
@@ -65,6 +43,22 @@ src_prepare() {
 			-i config/Makefile.inc.in \
 			|| die
 	done
+
+	# Disable renaming as it is stupind thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -73,13 +67,13 @@ src_configure() {
 	# bootstrap for cross compilation
 	if tc-is-cross-compiler; then
 		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) AR=$(tc-getBUILD_AR) \
-		RANLIB=$(tc-getBUILD_RANLIB) LD=$(tc-getBUILD_LD) \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
 		./configure --disable-renaming --disable-debug \
 			--disable-samples --enable-static || die
 		emake
 		mkdir -p "${WORKDIR}/host/"
-		cp -a {bin,lib,config} "${WORKDIR}/host/"
+		cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
 		emake clean
 
 		cross_opts="--with-cross-build=${WORKDIR}/host"
@@ -93,6 +87,15 @@ src_configure() {
 		${cross_opts}
 }
 
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
 src_test() {
 	# INTLTEST_OPTS: intltest options
 	#   -e: Exhaustive testing
@@ -112,8 +115,6 @@ src_install() {
 
 	dohtml ../readme.html
 	dodoc ../unicode-license.txt
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html/api
-		doins -r "${WORKDIR}/docs/"*
-	fi
+
+	use doc && dohtml -p api -r doc/html/
 }