[patch] icu-4.0.1.ebuild.patch

icu-4.0.1.ebuild.patch (text/plain), 2.07 KB, created by Arfrever Frehtes Taifersar Arahesis (RETIRED) on 2009-02-13 01:29:22 UTC

--- dev-libs/icu/icu-3.8.1-r1.ebuild
+++ dev-libs/icu/icu-4.0.1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1-r1.ebuild,v 1.7 2008/12/07 12:06:07 vapier Exp $
 
-inherit eutils versionator
+EAPI="2"
+
+inherit versionator
 
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/ http://ibm.com/software/globalization/icu/"
@@ -21,13 +23,13 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples"
 
 DEPEND="doc? ( app-arch/unzip )"
 RDEPEND=""
 
-S=${WORKDIR}/${PN}/source
+S="${WORKDIR}/${PN}/source"
 
 src_unpack() {
 	unpack ${SRCPKG}
@@ -35,23 +37,17 @@
 		mkdir userguide
 		pushd ./userguide > /dev/null
 		unpack ${USERGUIDE}
-		popd
+		popd > /dev/null
 
 		mkdir apidocs
 		pushd ./apidocs > /dev/null
 		unpack ${APIDOCS}
-		popd
+		popd > /dev/null
 	fi
+}
 
-	# See http://qa.openoffice.org/issues/show_bug.cgi?id=83146
-	# and http://bugs.icu-project.org/trac/ticket/5498 for details
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8-setBreakType-public.diff
-
-	# Bug 208001
-	epatch "${FILESDIR}"/${PN}-3.8-regexp-CVE-2007-4770+4771.diff
-
-	# do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
+src_prepare() {
+	# Do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
 	# Bug 202059
 	# http://bugs.icu-project.org/trac/ticket/6102
 	for x in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS ; do
@@ -59,13 +55,11 @@
 	done
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--enable-static \
 		$(use_enable debug) \
 		$(use_enable examples samples)
-
-	emake -j1 || die "emake failed"
 }
 
 src_install() {
@@ -75,7 +69,7 @@
 	dodoc ../unicode-license.txt
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/html/userguide
-		doins -r "${WORKDIR}"/userguide/*
+		doins -r "${WORKDIR}"/userguide/userguide/*
 
 		insinto /usr/share/doc/${PF}/html/apidocs
 		doins -r "${WORKDIR}"/apidocs/*