Add modify packages that don't cross compile (unzip, nspr, fontconfig,

curl, squid) properly

6 files changed, 246 insertions, 0 deletions

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
new file mode 100644
index 00000000..f62b1438
--- /dev/null
+++ b/media-libs/fontconfig/Manifest
@@ -0,0 +1,6 @@
+AUX cross-no-fc-prog.diff 337 RMD160 91802d8c474152e0c29976bb36938f7b2a0a17aa SHA1 30e0dd264f310d36a9dd903fdcc173d07bdd98e9 SHA256 40145a6701759c9f84748762d7dea85782920d9d07166f5e6290f50afce39918
+AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
+AUX fontconfig-2.5.0-libtool-2.2.patch 2589 RMD160 36a07e0161c6b2a970de19a090db4f750a519bea SHA1 e0267a4f29c670425861211cf960745021c22b6d SHA256 fce47ca38e8cff70ef7be40493b02b99ff2387a6e141a0e322ec8bfedee5b1a9
+AUX fontconfig-2.6.0-parallel.patch 437 RMD160 5a8ab14d0d86f19d0658768a37927bf1761b3d3c SHA1 f12963e627d0735aed4e3c5b9b16331fd293ce4a SHA256 0f0a2fd2ad9241aa680f2c4fa607cc7898e9d8e8aa585b68d47961f82cf424e8
+DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
+EBUILD fontconfig-2.6.0-r2.ebuild 3504 RMD160 56b9af28fadac4b58bc65093fa33bc2d29fa8313 SHA1 44a3994e78f425746d9888b2f2ad19896f4cd192 SHA256 aa82140172be22e4e9dd912fe135cc6e847d3f5233d330eaff702893ef5eabf8
diff --git a/media-libs/fontconfig/files/cross-no-fc-prog.diff b/media-libs/fontconfig/files/cross-no-fc-prog.diff
new file mode 100644
index 00000000..f7862c61
--- /dev/null
+++ b/media-libs/fontconfig/files/cross-no-fc-prog.diff
@@ -0,0 +1,11 @@
+--- Makefile.am.ori	2008-12-26 18:43:32.000000000 +0100
++++ Makefile.am	2008-12-26 18:43:42.000000000 +0100
+@@ -23,7 +23,7 @@
+ 
+ DOCSRC=@DOCSRC@
+ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
+-	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
++	conf.d $(DOCSRC) test
+ 	 
+ EXTRA_DIST = \
+         fontconfig.pc.in \
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch
new file mode 100644
index 00000000..6a6c01e2
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch
@@ -0,0 +1,15 @@
+--- configure.in.old	2006-03-31 18:31:26.000000000 +0200
++++ configure.in	2006-03-31 18:44:47.000000000 +0200
+@@ -407,7 +407,11 @@
+ # Let people not build/install docs if they don't have docbook
+ #
+ 
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook,           [  --disable-docbook                Don't build documentation],,)
++
++if test x$enable_docbook != xno; then
++	AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+ 
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+ 
diff --git a/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch
new file mode 100644
index 00000000..0da2b300
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch
@@ -0,0 +1,76 @@
+From: Keith Packard <keithp@keithp.com>
+Date: Sun, 4 May 2008 03:23:37 +0000 (-0700)
+Subject: Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)
+X-Git-Tag: 2.5.92
+X-Git-Url: http://gitweb.freedesktop.org/?p=fontconfig;a=commitdiff;h=19d124dc4f9a68e1c9ddce58bf79a5e11d2ccbfd
+
+Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)
+
+Libtool-2.2 introduces new restrictions. So now it does not allow LT_*
+variables as it includes marcros:
+
+m4_pattern_forbid([^_?LT_[A-Z_]+$])
+
+Rename the LT_ variables to LIBT_ to work around this restriction.
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -41,17 +41,17 @@ dnl libtool versioning
+ dnl bump revision when fixing bugs
+ dnl bump current and age, reset revision to zero when adding APIs
+ dnl bump current, leave age, reset revision to zero when changing/removing APIS
+-LT_CURRENT=4
+-LT_REVISION=0
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-LT_AGE=3
++LIBT_CURRENT=4
++LIBT_REVISION=0
++AC_SUBST(LIBT_CURRENT)
++AC_SUBST(LIBT_REVISION)
++LIBT_AGE=3
+ 
+-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+-AC_SUBST(LT_VERSION_INFO)
++LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
++AC_SUBST(LIBT_VERSION_INFO)
+ 
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+-AC_SUBST(LT_CURRENT_MINUS_AGE)
++LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
++AC_SUBST(LIBT_CURRENT_MINUS_AGE)
+ 
+ dnl ==========================================================================
+ 
+--- a/fontconfig-zip.in
++++ b/fontconfig-zip.in
+@@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
+ cd @prefix@
+ rm -f $ZIP
+ zip $ZIP -@ <<EOF
+-bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
++bin/libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll
+ etc/fonts/fonts.conf
+ EOF
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -112,7 +112,7 @@ libfontconfig_la_SOURCES = \
+ lib_LTLIBRARIES = libfontconfig.la
+ 
+ libfontconfig_la_LDFLAGS =			\
+-	-version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
++	-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
+ 
+ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
+ 
+@@ -148,6 +148,6 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC
+ 	(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
+  	grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/	/' | \
+ 	sort; \
+-	echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \
+-	echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@
++	echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
++	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
+ 	@ ! grep -q FcERROR $@ || ($(RM) $@; false)
diff --git a/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch
new file mode 100644
index 00000000..d44af519
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch
@@ -0,0 +1,22 @@
+=== modified file 'fc-case/Makefile.am'
+--- fc-case/Makefile.am	2008-06-22 15:28:39 +0000
++++ fc-case/Makefile.am	2008-06-22 15:50:28 +0000
+@@ -36,6 +36,8 @@
+ 
+ noinst_MANS=fc-case.man
+ 
++noinst_HEADERS=$(TARG)
++
+ fc_case_SRCS= \
+ 	fc-case.c \
+ 	fccaseint.h \
+@@ -52,7 +54,7 @@
+ 
+ ALIAS_FILES = fcalias.h fcaliastail.h
+ 
+-BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
++BUILT_SOURCES = $(ALIAS_FILES)
+ 
+ $(ALIAS_FILES): 
+ 	touch $(ALIAS_FILES)
+
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
new file mode 100644
index 00000000..2ffde41e
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.13 2008/12/07 11:50:22 vapier Exp $
+
+WANT_AUTOMAKE=1.9
+
+inherit eutils autotools libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
+
+LICENSE="fontconfig"
+SLOT="1.0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="doc"
+
+# Purposefully dropped the xml USE flag and libxml2 support. Having this is
+# silly since expat is the preferred way to go per upstream and libxml2 support
+# simply exists as a fallback when expat isn't around. expat support is the main
+# way to go and every other distro uses it. By using the xml USE flag to enable
+# libxml2 support, this confuses users and results in most people getting the
+# non-standard behavior of libxml2 usage since most profiles have USE=xml
+
+RDEPEND=">=media-libs/freetype-2.2.1
+	>=dev-libs/expat-1.95.3"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-text/docbook-sgml-utils
+		=app-text/docbook-sgml-dtd-3.1*	)"
+PDEPEND="app-admin/eselect-fontconfig"
+
+pkg_setup() {
+	#To get docbook2pdf
+	if use doc && !	{	built_with_use --missing false app-text/docbook-sgml-utils jadetex \
+				|| \
+				built_with_use --missing false app-text/docbook-sgml-utils tetex;
+			}
+	then
+		die "For this package to be built with the doc use flag, app-text/docbook-sgml-utils must be built with the jadetex use flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx #74077
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/cross-no-fc-prog.diff	# X-MW: No progs when cross-compil
+	# Neeeded to get a sane .so versionning on fbsd, please dont drop
+	# If you have to run eautoreconf, you can also leave the elibtoolize call as
+	# it will be a no-op.
+	eautomake
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+	if tc-is-cross-compiler; then
+		myconf="--with-arch=${ARCH}"
+		replace-flags -mtune=* -DMTUNE_CENSORED
+		replace-flags -march=* -DMARCH_CENSORED
+	fi
+	econf $(use_enable doc docs) \
+		--localstatedir=/var \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-default-fonts=/usr/share/fonts \
+		--with-add-fonts=/usr/local/share/fonts \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	#fc-lang directory contains language coverage datafiles
+	#which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	insinto /etc/fonts
+	doins "${S}"/fonts.conf
+
+	doman $(find "${S}" -type f -name *.1 -print)
+	newman doc/fonts-conf.5 fonts.conf.5
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if use doc; then
+		doman doc/Fc*.3
+		dohtml doc/fontconfig-devel.html
+		dodoc doc/fontconfig-devel.{txt,pdf}
+	fi
+
+	dodoc AUTHORS ChangeLog README
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf, we force update it ...
+	# <azarah@gentoo.org> (11 Dec 2002)
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/"
+	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
+	echo
+
+	if [[ ${ROOT} = / ]]; then
+		ebegin "Creating global font cache..."
+		/usr/bin/fc-cache -sr
+		eend $?
+	fi
+}