diff options
author | Daniel Ahlberg <aliz@gentoo.org> | 2004-09-18 10:19:26 +0000 |
---|---|---|
committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-09-18 10:19:26 +0000 |
commit | 0f5850179a38272b67c7f81a1ccb74e133eb1721 (patch) | |
tree | c7d60506f2f253b01f666141137a6221a86e86f2 | |
parent | New release (1.8.0). Assign this package to the gnome-a11y herd. (Manifest re... (diff) | |
download | gentoo-2-0f5850179a38272b67c7f81a1ccb74e133eb1721.tar.gz gentoo-2-0f5850179a38272b67c7f81a1ccb74e133eb1721.tar.bz2 gentoo-2-0f5850179a38272b67c7f81a1ccb74e133eb1721.zip |
Closing #64289
-rw-r--r-- | media-tv/mythfrontend/ChangeLog | 5 | ||||
-rw-r--r-- | media-tv/mythfrontend/mythfrontend-0.16.ebuild | 12 | ||||
-rw-r--r-- | media-tv/mythtv/ChangeLog | 5 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.16.ebuild | 16 |
4 files changed, 28 insertions, 10 deletions
diff --git a/media-tv/mythfrontend/ChangeLog b/media-tv/mythfrontend/ChangeLog index 455983858ef6..8fcb2f6d457f 100644 --- a/media-tv/mythfrontend/ChangeLog +++ b/media-tv/mythfrontend/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-tv/mythfrontend # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.24 2004/09/15 14:37:54 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.25 2004/09/18 10:19:26 aliz Exp $ + + 18 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythfrontend-0.16.ebuild: + Check if neither X or directfb are in USE, closing #64289. 15 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythfrontend-0.16.ebuild: + Fix build error, closing #64012. diff --git a/media-tv/mythfrontend/mythfrontend-0.16.ebuild b/media-tv/mythfrontend/mythfrontend-0.16.ebuild index 4bc0675a2459..e82ed4887c4c 100644 --- a/media-tv/mythfrontend/mythfrontend-0.16.ebuild +++ b/media-tv/mythfrontend/mythfrontend-0.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.16.ebuild,v 1.6 2004/09/15 14:37:54 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.16.ebuild,v 1.7 2004/09/18 10:19:26 aliz Exp $ inherit myth flag-o-matic @@ -33,7 +33,15 @@ RDEPEND="${DEPEND} S="${WORKDIR}/mythtv-${PV}" pkg_setup() { - local qt_use="$(</var/db/pkg/`best_version x11-libs/qt`/USE)" + if use X; then + QTP=x11-libs/qt + elif use directfb; then + QTP=x11-libs/qt-embedded + else + eerror "You must have either X or directfb in USE" + die "No QT library selected" + fi + local qt_use="$(</var/db/pkg/`best_version ${QTP}`/USE)" if ! has mysql ${qt_use} ; then eerror "Qt is missing MySQL support. Please add" eerror "'mysql' to your USE flags, and re-emerge Qt." diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 7642f0173f99..b017bf83b499 100644 --- a/media-tv/mythtv/ChangeLog +++ b/media-tv/mythtv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-tv/mythtv # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.37 2004/09/18 06:33:06 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.38 2004/09/18 10:18:02 aliz Exp $ + + 18 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythtv-0.16.ebuild: + Check if neither X or directfb are in USE, closing #64289. 18 Sep 2004; Doug Goldstein <cardoe@gentoo.org> mythtv-0.15.1-r1.ebuild, mythtv-0.16.ebuild: diff --git a/media-tv/mythtv/mythtv-0.16.ebuild b/media-tv/mythtv/mythtv-0.16.ebuild index 6bff35a221f4..1ba37c3dd262 100644 --- a/media-tv/mythtv/mythtv-0.16.ebuild +++ b/media-tv/mythtv/mythtv-0.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.7 2004/09/18 06:33:06 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.8 2004/09/18 10:18:02 aliz Exp $ inherit myth flag-o-matic eutils @@ -32,7 +32,15 @@ RDEPEND="${DEPEND} !media-tv/mythfrontend" pkg_setup() { - if use X; then QTP=x11-libs/qt; else QTP=x11-libs/qt-embedded; fi + if use X; then + QTP=x11-libs/qt + elif use directfb; then + QTP=x11-libs/qt-embedded + else + eerror "You must have either X or directfb in USE" + die "No QT library selected" + fi + local qt_use="$(</var/db/pkg/`best_version ${QTP}`/USE)" if ! has mysql ${qt_use} ; then eerror "Qt is missing MySQL support. Please add" @@ -130,10 +138,6 @@ setup_pro() { -e 's:#CONFIG += using_opengl:CONFIG += using_opengl:' \ -i 'settings.pro' || die "enable opengl sed failed" fi - - sed -e 's:#CONFIG += using_xrandr:CONFIG += using_xrandr:' \ - -e 's:#DEFINES += USING_XRANDR:DEFINES += USING_XRANDR:' \ - -i 'settings.pro' || die "enable xrandr sed failed" } src_unpack() { |