Move fontconfig behind truetype flag to match other ebuilds in tree.

Package-Manager: portage-2.1.4.4

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8e073ca469ea16d44016d42d326e5631c0088058..9488b5d09789028a73378d54ab7edfd81084033a 100644 (file)
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.122 2008/01/28 12:02:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.123 2008/02/15 15:39:00 drac Exp $
+
+  15 Feb 2008; Samuli Suominen <drac@gentoo.org> avidemux-2.4.ebuild:
+  Move fontconfig behind truetype flag to match other ebuilds in tree.
 
   28 Jan 2008; Samuli Suominen <drac@gentoo.org> avidemux-2.4.ebuild:
   Change qt dep to >=4.3 wrt #207743.

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 1baf554865e1b5b1b5d2b96396b2c922400b883b..774976e8cfdb5f319aa647f49f2be662ec4d592c 100644 (file)
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
 DIST avidemux_2.4.tar.gz 5728629 RMD160 2e02e2acc6f87cd8ecf781e3c4a37f03d9365640 SHA1 4a055580d65adbefcd52a159da9059f376a56cc6 SHA256 7ec094464637a8e4ba81021bcae15f04edbd3239d210fe6f9d2ef795c7febf11
-EBUILD avidemux-2.4.ebuild 3568 RMD160 56774f5b6238d2f98ac9fccf3fd34505cfb8a1aa SHA1 c7aa24388f251b754ae27407f00fbc6685236592 SHA256 97ca9d6989ec82c4ea2aed95f75e25128a5644e7dc22b778a7bf60655ef0b8b2
-MISC ChangeLog 21967 RMD160 9a998109f502d4dd2ea838b22c1aa414fc85822f SHA1 048303a4d19de67c93584cae15d725d25b66e7cf SHA256 316ad3bf08e92424ab2363c4241ad2bbd18a146c91eb0c94ad0ec8293533e4f8
+EBUILD avidemux-2.4.ebuild 3540 RMD160 eb1e112410524a8e49d8c33c50e4667a87958288 SHA1 49d40eaa913d41fb3a47dd713f52f04af20cea3c SHA256 67bf5c01fecc9054f7bf3d920f4ecb9bf916f5b695109ce76b8c6970a3a2ec08
+MISC ChangeLog 22109 RMD160 ec1ed391644ee55389e921cc2d26ff53cb415710 SHA1 1e6ce4f25eacf30e581000bbe8e9c990cf7d75cc SHA256 5f76f9411c1994298419ef3f75b138123cac674b0bdaa1221480a3c50455e060
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb

diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
index 102cb061d9b061dde971d89a110dfcbcaaab3d3e..46612daf777a0d7f9bdb8b9d5bc3bc18aeab632a 100644 (file)
--- a/media-video/avidemux/avidemux-2.4.ebuild
+++ b/media-video/avidemux/avidemux-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.2 2008/01/28 12:02:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.3 2008/02/15 15:39:00 drac Exp $
 
 inherit cmake-utils eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac aften alsa amrnb arts dts encode esd fontconfig jack libsamplerate
+IUSE="aac aften alsa amrnb arts dts encode esd jack libsamplerate
 x264 xv xvid vorbis truetype gtk qt4"
 
 RDEPEND="dev-libs/libxml2
@@ -21,7 +21,6 @@ RDEPEND="dev-libs/libxml2
        media-libs/libsdl
        >=dev-libs/glib-2
        alsa? ( media-libs/alsa-lib )
-       fontconfig? ( media-libs/fontconfig )
        xv? ( x11-libs/libXv )
        esd? ( media-sound/esound )
        jack? ( media-sound/jack-audio-connection-kit )
@@ -34,7 +33,8 @@ RDEPEND="dev-libs/libxml2
        aac? ( media-libs/faad2 )
        vorbis? ( media-libs/libvorbis )
        arts? ( kde-base/arts )
-       truetype? ( media-libs/freetype )
+       truetype? ( media-libs/freetype
+               media-libs/fontconfig )
        gtk? ( >=x11-libs/gtk+-2
                x11-libs/libX11 )
        qt4? ( >=x11-libs/qt-4.3
@@ -72,7 +72,7 @@ src_compile() {
        #use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
 
        # ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
-       use fontconfig || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
+       use truetype || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
        use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
        use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
        use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"