diff options
| -rw-r--r-- | media-libs/fontconfig/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild | 133 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.10.2.ebuild | 125 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.10.93.ebuild (renamed from media-libs/fontconfig/fontconfig-2.10.91.ebuild) | 20 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild | 132 |
5 files changed, 16 insertions, 403 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index 739e039ce069..0b5e15d013ea 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/fontconfig # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.175 2013/08/21 08:19:48 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.176 2013/08/21 08:42:47 yngwin Exp $ + +*fontconfig-2.10.93 (21 Aug 2013) + + 21 Aug 2013; Ben de Groot <yngwin@gentoo.org> +fontconfig-2.10.93.ebuild, + -fontconfig-2.10.2-r1.ebuild, -fontconfig-2.10.2.ebuild, + -fontconfig-2.10.91.ebuild, -fontconfig-2.8.0-r2.ebuild: + Version bump. Drop old ebuilds. 21 Aug 2013; Ben de Groot <yngwin@gentoo.org> fontconfig-2.10.92.ebuild: Order dependencies alphabetically and tighten up formatting diff --git a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild deleted file mode 100644 index 68250c92abab..000000000000 --- a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.4 2013/07/30 18:59:51 mgorny Exp $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=yes -inherit autotools-multilib readme.gentoo - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="doc static-libs" - -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the -# default and used by every distro. See bug #283191. - -# Note: replace emul-linux dep when expat becomes multilib-aware -# (and add [${MULTILIB_USEDEP}] on it then!) -RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}] - >=dev-libs/expat-1.95.3 - abi_x86_32? ( - amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-utils[jadetex] - =app-text/docbook-sgml-dtd-3.1* - )" -PDEPEND="app-admin/eselect-fontconfig - virtual/ttf-fonts" - -PATCHES=( - "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 - "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 -) - -pkg_setup() { - DOC_CONTENTS="Please make fontconfig configuration changes using - \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be - overwritten. If you need to reset your configuration to upstream defaults, - delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig." -} - -src_configure() { - local myeconfargs=( - $(use_enable doc docbook) - # always enable docs to install manpages - --enable-docs - --localstatedir="${EPREFIX}"/var - --with-default-fonts="${EPREFIX}"/usr/share/fonts - --with-add-fonts="${EPREFIX}"/usr/local/share/fonts - --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail - ) - - autotools-multilib_src_configure -} - -src_install() { - autotools-multilib_src_install - - # XXX: avoid calling this multiple times, bug #459210 - install_others() { - # stuff installed from build-dir - autotools-utils_src_compile \ - DESTDIR="${D}" -C doc install-man - - insinto /etc/fonts - doins "${BUILD_DIR}"/fonts.conf - } - multilib_foreach_abi install_others - - #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 - - dodoc doc/fontconfig-user.{txt,pdf} - - if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} - rm -rf "${ED}"usr/share/doc/fontconfig - fi - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf we force update it ... - 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"' > "${ED}"/etc/sandbox.d/37fontconfig - - readme.gentoo_create_doc -} - -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 ${EROOT}/etc/fonts/conf.d ]]; then - for file in "${EROOT}"/etc/fonts/conf.avail/*; do - f=${file##*/} - if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null - else - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null - fi - done - fi - eend $? -} - -pkg_postinst() { - einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/" - find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete - - readme.gentoo_print_elog - - if [[ ${ROOT} = / ]]; then - ebegin "Creating global font cache" - "${EPREFIX}"/usr/bin/fc-cache -srf - eend $? - fi -} diff --git a/media-libs/fontconfig/fontconfig-2.10.2.ebuild b/media-libs/fontconfig/fontconfig-2.10.2.ebuild deleted file mode 100644 index 748e3627fe16..000000000000 --- a/media-libs/fontconfig/fontconfig-2.10.2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2.ebuild,v 1.3 2013/03/09 07:26:03 zmedico Exp $ - -EAPI=5 -inherit autotools eutils libtool readme.gentoo - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="doc static-libs" - -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the -# default and used by every distro. See bug #283191. - -RDEPEND=">=media-libs/freetype-2.2.1 - >=dev-libs/expat-1.95.3" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-utils[jadetex] - =app-text/docbook-sgml-dtd-3.1* - )" -PDEPEND="app-admin/eselect-fontconfig - virtual/ttf-fonts" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 - epatch "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 - epatch_user - 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 it will be a no-op. - elibtoolize - - DOC_CONTENTS="Please make fontconfig configuration changes using - \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be - overwritten. If you need to reset your configuration to upstream defaults, - delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig." -} - -src_configure() { - # always enable docs to install manpages - econf \ - $(use_enable static-libs static) \ - $(use_enable doc docbook) \ - --enable-docs \ - --localstatedir="${EPREFIX}"/var \ - --with-default-fonts="${EPREFIX}"/usr/share/fonts \ - --with-add-fonts="${EPREFIX}"/usr/local/share/fonts \ - --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail -} - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" -C doc install-man - - find "${ED}" -name '*.la' -delete - - #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 - - dodoc doc/fontconfig-user.{txt,pdf} - dodoc AUTHORS ChangeLog README - - if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} - rm -rf "${ED}"usr/share/doc/fontconfig - fi - - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf we force update it ... - 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"' > "${ED}"/etc/sandbox.d/37fontconfig - - readme.gentoo_create_doc -} - -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 ${EROOT}/etc/fonts/conf.d ]]; then - for file in "${EROOT}"/etc/fonts/conf.avail/*; do - f=${file##*/} - if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null - else - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null - fi - done - fi - eend $? -} - -pkg_postinst() { - einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/" - find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete - - readme.gentoo_print_elog - - if [[ ${ROOT} = / ]]; then - ebegin "Creating global font cache" - "${EPREFIX}"/usr/bin/fc-cache -srf - eend $? - fi -} diff --git a/media-libs/fontconfig/fontconfig-2.10.91.ebuild b/media-libs/fontconfig/fontconfig-2.10.93.ebuild index c6f870cbe3c2..20ae0349f4b5 100644 --- a/media-libs/fontconfig/fontconfig-2.10.91.ebuild +++ b/media-libs/fontconfig/fontconfig-2.10.93.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.91.ebuild,v 1.2 2013/07/30 18:59:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.93.ebuild,v 1.1 2013/08/21 08:42:47 yngwin Exp $ EAPI=5 - AUTOTOOLS_AUTORECONF=yes + inherit autotools-multilib readme.gentoo DESCRIPTION="A library for configuring and customizing font access" @@ -13,31 +13,27 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2" LICENSE="MIT" SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~amd64-linux ~x86-linux" IUSE="doc static-libs" # Purposefully dropped the xml USE flag and libxml2 support. Expat is the # default and used by every distro. See bug #283191. -# Note: replace emul-linux dep when expat becomes multilib-aware -# (and add [${MULTILIB_USEDEP}] on it then!) -RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}] - >=dev-libs/expat-1.95.3 - abi_x86_32? ( - amd64? ( app-emulation/emul-linux-x86-baselibs[development] ) - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" +RDEPEND=">=dev-libs/expat-1.95.3[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}] + abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( - app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* + app-text/docbook-sgml-utils[jadetex] )" PDEPEND="app-admin/eselect-fontconfig virtual/ttf-fonts" PATCHES=( "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 - "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 + "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 ) pkg_setup() { diff --git a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild deleted file mode 100644 index 676ede5679ae..000000000000 --- a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2012 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-r2.ebuild,v 1.4 2012/05/05 08:02:34 jdhore Exp $ - -EAPI="4" - -inherit autotools 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="doc static-libs" - -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the -# default and used by every distro. See bug #283191. - -RDEPEND=">=media-libs/freetype-2.2.1 - >=dev-libs/expat-1.95.3" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-utils[jadetex] - =app-text/docbook-sgml-dtd-3.1* - )" -PDEPEND="app-admin/eselect-fontconfig - virtual/ttf-fonts" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 - epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch # 310157 - epatch "${FILESDIR}"/${PN}-2.8.0-urw-aliases.patch # 303591 - - 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 - # 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 static-libs static) \ - $(use_enable doc docs) \ - $(use_enable doc docbook) \ - --localstatedir=/var \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts \ - ${myconf} || die -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install" - emake DESTDIR="${D}" -C doc install-man || die "emake install-man" - - find "${ED}" -name '*.la' -exec rm -f {} + - - #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 - - dodoc doc/fontconfig-user.{txt,pdf} - dodoc AUTHORS ChangeLog README - - if [[ -e ${D}usr/share/doc/fontconfig/ ]]; then - mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P} - rm -rf "${D}"usr/share/doc/fontconfig - fi - - # 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 - - # 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 -srf - eend $? - fi -} |