version bump

Package-Manager: portage-2.2_rc37/cvs/Linux x86_64

4 files changed, 85 insertions, 6 deletions

diff --git a/media-libs/libass/ChangeLog b/media-libs/libass/ChangeLog
index c60ab3edfe16..3210e04151d9 100644
--- a/media-libs/libass/ChangeLog
+++ b/media-libs/libass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libass
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/ChangeLog,v 1.13 2009/06/27 09:23:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/ChangeLog,v 1.14 2009/08/10 10:19:24 aballier Exp $
+
+*libass-0.9.7 (10 Aug 2009)
+
+  10 Aug 2009; Alexis Ballier <aballier@gentoo.org> +libass-0.9.7.ebuild,
+  +files/libass-0.9.7-nofc.patch:
+  version bump
 
 *libass-0.9.6 (27 Jun 2009)
 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index df5c30a8c0fd..835d59e18711 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 AUX libass-0.9.5_automagic.patch 1556 RMD160 7e6c3ff6c102a7ac1d291968fc7022b932c059f2 SHA1 3f13efd1839397ebc851555b5225796ffdd5cf16 SHA256 a7aec8d558c9f75a8b0957079a521ca41b9b1d94efd73f90846d236c2bf4a46b
 AUX libass-0.9.6_automagic.patch 1609 RMD160 f74030ee8627d27068d1d41a909f1bf5c44c5004 SHA1 bb53faea026ab9833706620d1687cff249378e5c SHA256 c61bc97ad9903b5106243f36d2462d2b5e8eb46a32c49bcb190cd2f93047f6b8
+AUX libass-0.9.7-nofc.patch 827 RMD160 50aec2872f682d993510c19637d750a49b4ed24e SHA1 bb49f8a744b52930f38dd9e2aa08449216e68ad9 SHA256 89ae3bf7b4a2e6a59fcd66dc0c5368856601794304a5cbdf8f93678960e76984
 DIST libass-0.9.5.tar.bz2 275168 RMD160 923b8b48a0d7762801594f3eae7b8709716e3c38 SHA1 9f519180e5548fd7e4e7dbcc8bd0b067bc7bf7e0 SHA256 3b9459ec9b5e07e0a2e0ca041141232587cce16e20f6af7c6d8a33f5971b6098
 DIST libass-0.9.6.tar.bz2 286141 RMD160 7f76ed4d42f20d1760664aeffe346de0011409d0 SHA1 50c742287d155dd2c3235de39cd0c22a9a43f994 SHA256 6e1f1e6df7ba7ca60cdef7801ca55ebb7269e4778518ce0bbb8dedfcf09b406d
+DIST libass-0.9.7.tar.bz2 276480 RMD160 b22849e8b92736aa6a8eb6e9b2b30c0e682f7909 SHA1 a739b2ca1259f463c1ec04cf31d10cf5b47ab2a8 SHA256 562141a805481ae1b96a9e0953d85c347ee4ee5576bd09df7486cadd2623c756
 EBUILD libass-0.9.5.ebuild 1023 RMD160 bf2a53818b6e3895bc5b79ace4070f1e164cd67b SHA1 38a3ab3395722b5facc48124bd3c84f398b762b2 SHA256 02f19d13d66705284df65b112ef365dbc0b8b9b134ff1a3e050e6c2ffe5a920f
 EBUILD libass-0.9.6.ebuild 1030 RMD160 6e94c7ca767477fd0d508d18de7dae9aa6254290 SHA1 53207ae4533b0ff52e8f0f0619482df6189db4ea SHA256 c480511fd309a271f150673dbd340a3dd8f35fec81c97e50a8764e1efe6b54d3
-MISC ChangeLog 1678 RMD160 72e00d876b893c37b4bfbb19c21ce65e3bc25958 SHA1 bef903630b8989d96e79d3956d4eb42cc7669d7f SHA256 fc1d3928c6e2cf32c6accc05fefc52107b5acdc460a29262afe0165330878ea1
+EBUILD libass-0.9.7.ebuild 982 RMD160 23ef07391bef9fc485cf26e9ac259c24ee3d5084 SHA1 2df5686ce77eac8436a3fd036efefae8ecf68616 SHA256 9f122813f456629b0abf2cf6b2f3f717e30e16291f591b99ea91408255dd02b5
+MISC ChangeLog 1831 RMD160 0317643ec8080c03ee366656dc6005c619ae91a7 SHA1 77b5ce5ca8f96e30bf54a2d09b9816ea0f045c7a SHA256 58180c17a6e53b53012e91373af94a8355b59244e0eef0af11ccf5ebdf524b9a
 MISC metadata.xml 318 RMD160 04fbbbc2659e57cca01100801950aab20582f96f SHA1 e15ee10875cdaf0253ee9c11e8b1173a62fb0685 SHA256 3969751760d92f50b10c0e6379a34103d92d9e04baba5530d2f64093771b5717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpF5NQACgkQvFcC4BYPU0pxsQCgigsA2u5bS0wv7E0y/IqKWH0R
-0JMAoIHdwHw4sJCQeHwDxYJ+GUobi08y
-=uvuq
+iEYEARECAAYFAkp/9DYACgkQvFcC4BYPU0p/CwCfTCH49d1zt0gd2xncqyKAkNTL
+71wAn2JRdBtLKLtgXjAVXiejW8xNPhWO
+=B3At
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libass/files/libass-0.9.7-nofc.patch b/media-libs/libass/files/libass-0.9.7-nofc.patch
new file mode 100644
index 000000000000..1818c27fb0bb
--- /dev/null
+++ b/media-libs/libass/files/libass-0.9.7-nofc.patch
@@ -0,0 +1,29 @@
+http://code.google.com/p/libass/issues/detail?id=3
+
+From b1233b1fa2180b8ee197569ff043acbc669db726 Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Mon, 10 Aug 2009 12:03:13 +0200
+Subject: [PATCH] Fix build without fontconfig
+
+---
+ libass/ass_fontconfig.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
+index 684c2a4..006be97 100644
+--- a/libass/ass_fontconfig.c
++++ b/libass/ass_fontconfig.c
+@@ -564,8 +564,10 @@ int fontconfig_update(FCInstance *priv)
+ 
+ void fontconfig_done(FCInstance *priv)
+ {
++#ifdef CONFIG_FONTCONFIG
+     if (priv && priv->config)
+         FcConfigDestroy(priv->config);
++#endif
+     if (priv && priv->path_default)
+         free(priv->path_default);
+     if (priv && priv->family_default)
+-- 
+1.6.4
+
diff --git a/media-libs/libass/libass-0.9.7.ebuild b/media-libs/libass/libass-0.9.7.ebuild
new file mode 100644
index 000000000000..25602a98bd41
--- /dev/null
+++ b/media-libs/libass/libass-0.9.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/libass-0.9.7.ebuild,v 1.1 2009/08/10 10:19:24 aballier Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="http://code.google.com/p/libass/"
+SRC_URI="http://libass.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="enca fontconfig png"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.2.0 )
+	>=media-libs/freetype-2.1.10
+	png? ( >=media-libs/libpng-1.2.15 )
+	virtual/libiconv
+	enca? ( app-i18n/enca )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-nofc.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable enca) \
+		$(use_enable fontconfig) \
+		$(use_enable png)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc Changelog
+}