Revision bump to not build static libs and punt .la file. Remove older overshadowed...
authorTomas Chvatal <scarabeus@gentoo.org>
Fri, 9 Sep 2011 15:09:15 +0000 (15:09 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Fri, 9 Sep 2011 15:09:15 +0000 (15:09 +0000)
Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

media-libs/fontconfig/ChangeLog
media-libs/fontconfig/Manifest
media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch [deleted file]
media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild [deleted file]
media-libs/fontconfig/fontconfig-2.7.3.ebuild [deleted file]
media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild [moved from media-libs/fontconfig/fontconfig-2.8.0.ebuild with 90% similarity]

index 89130457066cd22a8f4ddce41baaacad5421da89..4572f01b9a388c5161031ab65f25b075b835a66d 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.156 2011/05/20 19:32:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.157 2011/09/09 15:09:15 scarabeus Exp $
+
+*fontconfig-2.8.0-r2 (09 Sep 2011)
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -fontconfig-2.6.0-r2.ebuild, -files/fontconfig-2.6.0-parallel.patch,
+  -fontconfig-2.7.3.ebuild, -fontconfig-2.8.0.ebuild,
+  +fontconfig-2.8.0-r2.ebuild:
+  Revision bump to not build static libs and punt .la file. Remove older
+  overshadowed versions.
 
   20 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
   fontconfig-2.8.0-r1.ebuild:
index 33861cb5e60abe049b15d5f69a7abd9fb603356e..cd55bdae9d504db56ad69bf9e42c8cdd28f0a60d 100644 (file)
@@ -2,24 +2,27 @@
 Hash: SHA1
 
 AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
-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
 AUX fontconfig-2.8.0-urw-aliases.patch 509 RMD160 b735f3bf416f79e82f2b0944e80972514c313ef6 SHA1 6af46fdd965cee43ec461cb2a4bd5e1fdffc8dd9 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4
-DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
-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.6.0-r2.ebuild 3059 RMD160 91d3278cbf34e223a5c00132abf85e15930f5b45 SHA1 8f43105d2e4e0a18074895c6339dd454ae96075c SHA256 4c7630e52a1df096ab5c3f9a9b03286a16c2f10d093b7097724e9468c4c7b815
-EBUILD fontconfig-2.7.3.ebuild 4150 RMD160 5b260e46842f74b6d2e3e4cd4db7212f7e8b08f2 SHA1 af382113f092c880f8d605ee80ef8c1e88f3632d SHA256 78d33fa95316e8050c51a973fbed7ff012a97f4b91ebe4a66def27fbfb1fb8e1
 EBUILD fontconfig-2.8.0-r1.ebuild 3984 RMD160 5d05157dfa506f4624439fe07bc5d9aa45d945c5 SHA1 76ffcb1df0769dc71b834708c2490ab5845aeef5 SHA256 4da792319d5bdeb01e4d2b72ba75ee3b579507d95d9dff7aa3f160abb0ee3da5
-EBUILD fontconfig-2.8.0.ebuild 3898 RMD160 25b975bc6e69fa0de4e951ca0653168263abec8e SHA1 5946cdd40cd8069d08225fb40e8646cf52b5b96e SHA256 21bde82041c3fe3c7a78d28fe069b02a7ab35ac73767fd68338ca579810701ef
-MISC ChangeLog 24598 RMD160 08dfdcb1e59e6777fdb6b427e108f44a8497f2d5 SHA1 8a8ce45a567d10ce3a336a3f71c6a11ec7b22789 SHA256 f1b62a9e5cd2b54ee27515b435d338d82fc40ccbdcb46827c0e1073008a46b68
+EBUILD fontconfig-2.8.0-r2.ebuild 4059 RMD160 d648d4799467c237ecacb8ae91f659b512228b99 SHA1 187af2a7946871d58cbed20ca4175772751086e9 SHA256 4c0f4c502b30cfd4e2b843e03be9d424a593cf05a7be70d1ddc56d596f6c2bf0
+MISC ChangeLog 24943 RMD160 98fd5da1b3ce48b007871c28104fc7bcde395656 SHA1 6051c5f5206decc523295ab73e80af782ef32e68 SHA256 b4556433cda098a9efffbe05c905fa3bf106cb874be45a7b6fc91efae18af3db
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk3WwdoACgkQIiMqcbOVdxTokQQAmOf1LoeMRwwdevW5q5GnX50M
-ZwMTWz/5kHp0Pbq5B8LHXnnkkgfLKT7bCgD3D/g1PcNqU5A+n5OQ1ODQqdTsVk36
-zCf8bH2i2Gii4EviF5HfxGjNXk6K4i85t6g+dnpRcZg5wUPrLDNMN8BtdUQa4emJ
-kGKijS2KMOZr/LQwQhg=
-=1Tvv
+iQIcBAEBAgAGBQJOaiwyAAoJEOSiRoyO7jvoN5UP/jg93kbaKiAtmusJBgbHYhh8
+VPJuk6PaDemHlDw2pFno3hlq4Qb57alZzGnA5z5NlzOKqWT1DR707DAti0R/HSOu
+jlV0vFmzt7wnZ989JEGc9SP4dvyHXoA0IaRkWkGuoDoUWDdAHbKWizNgezkLSj3c
+OHjRfVDE5D4mt055JWmZ5vLIypkzQ16OjeWYzD62LBVkWhMZxwqxNI1VmKY0x1wV
+HTbk570nG7DryV0TEzn5hBIoLy7/9Akt84DrIoTdes5GVqpH+NgZH2fjhjQBIPVv
+Sd7aY8RvXZEWiZc1Hc/sVARl7f99/V7/CiHEIWJdMHiYmvzmINC5DqF33MAsUZeq
+3+Mrh8II4V2YVM7p06l+9dCPTmVE9JkfB2Axm2QRCYoBZZXwOJ+XNXPdLDHu/LkH
+j7p2iDl21XqMVzIMec8Hi7r0GqbJsRZ19qG6y22m2ly6CJaY0zj11kHoHIgDbWcu
+jeE+C/h0Ooa0rUbo+NK+0vaJ97Lcy0QBLV2WweEUreyHMvUJN6YGCr2a7xHTlYGW
+qIecrRafRSal3zSMlmi8obgzyg9Br7RGY2r7GGBJBv5rT/hhWPbG6ImBGKwx7snx
+we7fcAQZuoDqXlQs90X4cMt9aM1U7ZU97dgwwrmYXeE9j7Ou75MWNbuIM9Agt6y9
+LLkxjkvsJ4gxs6h7l9bA
+=bkGP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch
deleted file mode 100644 (file)
index d44af51..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-=== 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
deleted file mode 100644 (file)
index 6924f25..0000000
+++ /dev/null
@@ -1,102 +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.6.0-r2.ebuild,v 1.15 2009/12/14 10:02:29 remi Exp $
-
-EAPI="2"
-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="MIT"
-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[jadetex]
-               =app-text/docbook-sgml-dtd-3.1*
-       )"
-PDEPEND="app-admin/eselect-fontconfig"
-
-src_prepare() {
-       epunt_cxx #74077
-       epatch "${FILESDIR}"/${P}-parallel.patch
-       # 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_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 ...
-       # <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
-}
diff --git a/media-libs/fontconfig/fontconfig-2.7.3.ebuild b/media-libs/fontconfig/fontconfig-2.7.3.ebuild
deleted file mode 100644 (file)
index 767db41..0000000
+++ /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.3.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 ...
-       # <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 -sr
-               eend $?
-       fi
-}
similarity index 90%
rename from media-libs/fontconfig/fontconfig-2.8.0.ebuild
rename to media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
index f0b2308fea2276d06174fa506f8c60d4c32495ba..5f06c71f620f11d3a244a21f391d4a6ad56c6a30 100644 (file)
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.10 2010/05/24 16:09:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.1 2011/09/09 15:09:15 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit autotools eutils libtool toolchain-funcs flag-o-matic
 
@@ -12,7 +12,7 @@ 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"
+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.  Expat is the
@@ -26,11 +26,13 @@ DEPEND="${RDEPEND}
                app-text/docbook-sgml-utils[jadetex]
                =app-text/docbook-sgml-dtd-3.1*
        )"
-PDEPEND="app-admin/eselect-fontconfig"
+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
 
@@ -48,6 +50,7 @@ src_configure() {
                replace-flags -march=* -DMARCH_CENSORED
        fi
        econf \
+               --disable-static \
                $(use_enable doc docs) \
                $(use_enable doc docbook) \
                --localstatedir=/var \
@@ -60,6 +63,8 @@ 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