1. "host/tools/gentest/gentest" is needed for cross test; 2. Dropping "#define U_DISABLE_RENAMING 1" is not good; 3. Build log should be verbose by default. --- icu-50_rc-r2.ebuild 2012-11-04 12:26:19.000000000 +0000 +++ icu-50_rc-r2.ebuild 2012-11-04 22:49:35.665130693 +0000 @@ -4,11 +4,7 @@ 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 +inherit autotools eutils toolchain-funcs versionator base MAJOR_VERSION="$(get_version_component_range 1)" if [[ ${PV/_rc/} != ${PV} ]]; then @@ -19,17 +15,14 @@ fi 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 )" +DEPEND="doc? ( app-doc/doxygen )" RDEPEND="!dev-libs/icu:0/50" S="${WORKDIR}/${PN}/source" @@ -40,17 +33,9 @@ QA_FLAGS_IGNORED="/usr/lib.*/libicudata\ PATCHES=( "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch" "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch" + "${FILESDIR}/${PN}-50-doc.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 +50,10 @@ src_prepare() { -i config/Makefile.inc.in \ || die done + + sed -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" -i common/unicode/uconfig.h + + eautoreconf } src_configure() { @@ -73,13 +62,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 + emake VERBOSE=1 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 +82,13 @@ src_configure() { ${cross_opts} } +src_compile() { + emake VERBOSE=1 + if use doc; then + doxygen -u Doxyfile && doxygen Doxyfile || die + fi +} + src_test() { # INTLTEST_OPTS: intltest options # -e: Exhaustive testing @@ -112,8 +108,5 @@ 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/ }