From 2eb8e9a326ebb76556c9545e7430eb37c438d549 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 11 Apr 2010 01:00:59 +0000 Subject: [PATCH] Disable doc regeneration with USE="-doc" (bug #310157). Drop epunt_cxx call that hasn't been applying for a while now. Remove old. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-libs/fontconfig/ChangeLog | 8 +- media-libs/fontconfig/Manifest | 19 +-- .../files/fontconfig-2.5.0-libtool-2.2.patch | 76 ---------- .../fontconfig/fontconfig-2.5.0-r1.ebuild | 91 ------------ .../fontconfig/fontconfig-2.7.1-r1.ebuild | 132 ------------------ media-libs/fontconfig/fontconfig-2.7.2.ebuild | 132 ------------------ media-libs/fontconfig/fontconfig-2.8.0.ebuild | 14 +- 7 files changed, 22 insertions(+), 450 deletions(-) delete mode 100644 media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch delete mode 100644 media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild delete mode 100644 media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild delete mode 100644 media-libs/fontconfig/fontconfig-2.7.2.ebuild diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index 164df43e373a..b9a7ceccdaa6 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/fontconfig # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.145 2010/03/31 16:40:22 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.146 2010/04/11 01:00:59 dirtyepic Exp $ + + 11 Apr 2010; Ryan Hill -fontconfig-2.5.0-r1.ebuild, + -files/fontconfig-2.5.0-libtool-2.2.patch, -fontconfig-2.7.1-r1.ebuild, + -fontconfig-2.7.2.ebuild, fontconfig-2.8.0.ebuild: + Disable doc regeneration with USE="-doc" (bug #310157). Drop epunt_cxx + call that hasn't been applying for a while now. Remove old. 31 Mar 2010; Christian Faulhammer fontconfig-2.8.0.ebuild: diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index b9f32b05cf0c..29d53ffb1f1f 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -2,27 +2,20 @@ Hash: SHA1 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 AUX fontconfig-2.7.1-latin-reorder.patch 1701 RMD160 ea313617ab751d328e0c4cfb75262ed2acc9a4ef SHA1 e079a3d03c4e2e4dfd36131689694159591ce4bf SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 -DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da SHA1 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 SHA256 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5 -DIST fontconfig-2.7.1.tar.gz 1539165 RMD160 34e0f6348486ab5304d6ecee4fe33f932689f380 SHA1 2e66fdf848f5002ba9a095998604ead2d3c392f1 SHA256 08502404aa451ddc5f9ca4bf45cc3b3f1e86e3f0779ff273c72e1c48e0c25b94 -DIST fontconfig-2.7.2.tar.gz 1540595 RMD160 a903da1e7d191798c244707caea6907d68c037df SHA1 4f7fdb3b00ff5a361636815299d8a00301a4f4d7 SHA256 100ba5b9e944bb2b03193ee65bba1f3756a0fc3dc3a1c39e74ea42b6ffaa929d DIST fontconfig-2.7.3.tar.gz 1542781 RMD160 2c349203592007b9cad439befccfc8fe05a977b1 SHA1 bc84b883673a7f43f2849f06ec110c4eaccfb42c SHA256 ba8fbff15c6b0395ed2f263311250bc8d36eb8793d122014429becab5c94b050 DIST fontconfig-2.8.0.tar.gz 1548409 RMD160 fefee412cad4fa71b573e997e14f1df12f439be2 SHA1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 -EBUILD fontconfig-2.5.0-r1.ebuild 2499 RMD160 44fa239408c44e4edf35fcfa2271ead3a706c5ba SHA1 f0791a7da5ab082b02c690363b1d63896051115f SHA256 d9625a666a1248f31a497c021abac739bc6b9f971e3682d9c9d24ab52494d541 EBUILD fontconfig-2.6.0-r2.ebuild 3059 RMD160 91d3278cbf34e223a5c00132abf85e15930f5b45 SHA1 8f43105d2e4e0a18074895c6339dd454ae96075c SHA256 4c7630e52a1df096ab5c3f9a9b03286a16c2f10d093b7097724e9468c4c7b815 -EBUILD fontconfig-2.7.1-r1.ebuild 4146 RMD160 97fbd65923e62f319eb1e66eb60ad430d42825b6 SHA1 9eb3336dde0627469c37893cfadc886369adc301 SHA256 03c25a96a15d3dfa30b6ac22a9685efa2b640cb47498dcc2a30bee5486d61939 -EBUILD fontconfig-2.7.2.ebuild 4150 RMD160 98735da86eac2c3aac117b53a29ecb18a7ca8538 SHA1 23807be764b1733d66657cce420820569ccc9230 SHA256 4ae5799ce5bd6d28aa160dbc63d49fe7873bfcc5a0327614ef0aa330efaee26e EBUILD fontconfig-2.7.3.ebuild 4150 RMD160 5b260e46842f74b6d2e3e4cd4db7212f7e8b08f2 SHA1 af382113f092c880f8d605ee80ef8c1e88f3632d SHA256 78d33fa95316e8050c51a973fbed7ff012a97f4b91ebe4a66def27fbfb1fb8e1 -EBUILD fontconfig-2.8.0.ebuild 3803 RMD160 ef3853bbff0f9d896c565fe84db15c48fee5ce37 SHA1 a7823c9ddfe7e1118fe473d4e09aa0b704dadee6 SHA256 ede704b9b0c6bc75a36ebe10e4253753bfad9ab5594b7940251d876eab29e0ee -MISC ChangeLog 22826 RMD160 a53413a484965be686832dd17a8f82c781f861f0 SHA1 d5a3f079115b90bd41765d60a475d8916ec0a573 SHA256 9d0370f200ddcc829277f65fea4e9b0836dae346c0a046240d20f5257f9cdc16 +EBUILD fontconfig-2.8.0.ebuild 3907 RMD160 594eee384a51972a2e7d72972e1c31b797b0c6ef SHA1 abd1eb266dbb9c611a2af860b1a0f44a955b5d04 SHA256 e990be0bd7d8133038ead99ee8d35d627fd879bbc4deb76158e15b9bebe1309c +MISC ChangeLog 23170 RMD160 641debf3da13cbbe0e193b336ff21e2db2ffd870 SHA1 3786a14040b5919f5b48dcbbf7a21c84ad17ab48 SHA256 35cbe751b9250192773e1dafd4ff94c9454436f74a73e5c8df259ec186ddc8c5 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkuzevwACgkQNQqtfCuFneNxGQCffrEZP8h3sxyO1czY1xEvyI4K -CzEAn3egr/E+RnV9/SwJzWg0B4faDMrH -=PzOG +iEYEARECAAYFAkvBH/kACgkQiqiDRvmkBmICqQCcD1snlh5HDoYXJZS0W4xxtjgd +Xc4An2HzHb78S99A4Sg0OJluz48fbdmc +=/Umy -----END PGP SIGNATURE----- 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 deleted file mode 100644 index 0da2b300680b..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Keith Packard -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 -@ <$@ -+ 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/fontconfig-2.5.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild deleted file mode 100644 index e331b7df4ded..000000000000 --- a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild,v 1.11 2009/12/14 10:02:29 remi Exp $ - -inherit eutils libtool autotools - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.gz" - -LICENSE="MIT" -SLOT="1.0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="doc xml" - -RDEPEND=">=media-libs/freetype-2.1.4 - !xml? ( >=dev-libs/expat-1.95.3 ) - xml? ( >=dev-libs/libxml2-2.6 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-text/docbook-sgml-utils )" -PDEPEND="app-admin/eselect-fontconfig" - -src_unpack() { - unpack ${A} - - cd "${S}" - # add docbook switch so we can disable it - epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch - epatch "${FILESDIR}"/${P}-libtool-2.2.patch #213831 Fix libtool-2.2 brekage - - eautoreconf - epunt_cxx #74077 -} - -src_compile() { - # I'm thinking this should be removed - [[ ${ARCH} == alpha && ${CC} == ccc ]] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables local docs generation, they come with the tarball - econf $(use_enable doc docs) \ - $(use_enable doc docbook) \ - --localstatedir=/var \ - --with-docdir=/usr/share/doc/${PF} \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts \ - $(use_enable xml libxml2) \ - || die - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - insinto /etc/fonts - doins "${S}"/fonts.conf - - newman doc/fonts-conf.5 fonts.conf.5 - dohtml doc/fontconfig-user.html - dodoc doc/fontconfig-user.{txt,pdf} - - if use doc; then - doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc - dohtml -r doc/fontconfig-devel - dodoc doc/fontconfig-devel.{txt,pdf} - fi - - dodoc AUTHORS ChangeLog NEWS 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 ... - # (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 -} diff --git a/media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild deleted file mode 100644 index 7e67bb123f94..000000000000 --- a/media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.7.1-r1.ebuild,v 1.2 2009/12/14 10:02:29 remi Exp $ - -EAPI="2" - -inherit eutils 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="MIT" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~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[jadetex] - =app-text/docbook-sgml-dtd-3.1* - )" -PDEPEND="app-admin/eselect-fontconfig" - -src_prepare() { - epatch "${FILESDIR}"/${P}-latin-reorder.patch #130466 - epunt_cxx #74077 - - # Needed to get a sane .so versioning 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. - elibtoolize -} - -src_configure() { - 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 -} - -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 || die - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # (11 Dec 2002) - echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig - doenvd "${T}"/37fontconfig - - # As of fontconfig 2.7, everything sticks their noses in here. - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig -} - -pkg_preinst() { - # Bug #193476 - # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various - # config files. If we install as-is, we'll blow away user settings. - - ebegin "Syncing fontconfig configuration to system" - if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then - for file in "${ROOT}"/etc/fonts/conf.avail/*; do - f=${file##*/} - if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then - [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ - && ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null - else - [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ - && rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null - fi - done - fi - eend $? -} - -pkg_postinst() { - einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/" - find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete - - echo - ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`" - ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten." - ewarn - ewarn "If you need to reset your configuration to upstream defaults, delete" - ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig." - echo - - if [[ ${ROOT} = / ]]; then - ebegin "Creating global font cache" - /usr/bin/fc-cache -sr - eend $? - fi -} diff --git a/media-libs/fontconfig/fontconfig-2.7.2.ebuild b/media-libs/fontconfig/fontconfig-2.7.2.ebuild deleted file mode 100644 index 89a94d75cdfc..000000000000 --- a/media-libs/fontconfig/fontconfig-2.7.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.7.2.ebuild,v 1.2 2009/12/14 10:02:29 remi Exp $ - -EAPI="2" - -inherit eutils 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="MIT" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~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[jadetex] - =app-text/docbook-sgml-dtd-3.1* - )" -PDEPEND="app-admin/eselect-fontconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch #130466 - epunt_cxx #74077 - - # Needed to get a sane .so versioning 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. - elibtoolize -} - -src_configure() { - 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 -} - -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 || die - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # (11 Dec 2002) - echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig - doenvd "${T}"/37fontconfig - - # As of fontconfig 2.7, everything sticks their noses in here. - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig -} - -pkg_preinst() { - # Bug #193476 - # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various - # config files. If we install as-is, we'll blow away user settings. - - ebegin "Syncing fontconfig configuration to system" - if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then - for file in "${ROOT}"/etc/fonts/conf.avail/*; do - f=${file##*/} - if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then - [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ - && ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null - else - [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ - && rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null - fi - done - fi - eend $? -} - -pkg_postinst() { - einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/" - find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete - - echo - ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`" - ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten." - ewarn - ewarn "If you need to reset your configuration to upstream defaults, delete" - ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig." - echo - - if [[ ${ROOT} = / ]]; then - ebegin "Creating global font cache" - /usr/bin/fc-cache -sr - eend $? - fi -} diff --git a/media-libs/fontconfig/fontconfig-2.8.0.ebuild b/media-libs/fontconfig/fontconfig-2.8.0.ebuild index 9f4a1e29087c..69a8c7fe3c0b 100644 --- a/media-libs/fontconfig/fontconfig-2.8.0.ebuild +++ b/media-libs/fontconfig/fontconfig-2.8.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0.ebuild,v 1.7 2010/03/31 16:40:22 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0.ebuild,v 1.8 2010/04/11 01:00:59 dirtyepic Exp $ EAPI="2" -inherit eutils libtool toolchain-funcs flag-o-matic +inherit autotools eutils libtool toolchain-funcs flag-o-matic DESCRIPTION="A library for configuring and customizing font access" HOMEPAGE="http://fontconfig.org/" @@ -29,8 +29,10 @@ DEPEND="${RDEPEND} PDEPEND="app-admin/eselect-fontconfig" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch #130466 - epunt_cxx #74077 + epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 + epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch # 310157 + + eautoreconf # Needed to get a sane .so versioning on fbsd, please dont drop # If you have to run eautoreconf, you can also leave the elibtoolize call as @@ -45,7 +47,9 @@ src_configure() { replace-flags -mtune=* -DMTUNE_CENSORED replace-flags -march=* -DMARCH_CENSORED fi - econf $(use_enable doc docs) \ + econf \ + $(use_enable doc docs) \ + $(use_enable doc docbook) \ --localstatedir=/var \ --with-default-fonts=/usr/share/fonts \ --with-add-fonts=/usr/local/share/fonts \ -- 2.26.2