Enable compilation with USE=-X. See Bug #98797.

Package-Manager: portage-2.0.51.22-r3

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 85b648a674a18371fe90e17b4f5549c6eafdd76b..f7cdbf7cabf8eb0717df00f797f07bfec76a883a 100644 (file)
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.27 2005/09/15 20:10:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.28 2005/10/09 12:29:17 zzam Exp $
+
+  09 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/xawtv-3.94-no-x11.patch, xawtv-3.94-r2.ebuild:
+  Enable compilation with USE=-X. See Bug #98797.
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> xawtv-3.94-r1.ebuild:
   Mark 3.94-r1 stable on alpha

diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index a3a1eab17c3ef91cca1a8dbacbb96941a7d9d5ee..373918aa54576b12a98e1cb43cd89f973a83fd59 100644 (file)
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,13 +1,14 @@
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 77a7875870df2cb8e4e59d88b6a81583 xawtv-3.94-r2.ebuild 2819
-MD5 03708c41e205560af7bbcf10664887d2 ChangeLog 9426
+MD5 712f090edf08fcb884b58b94a7ff7666 xawtv-3.94-r2.ebuild 2988
 MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151
+MD5 01d320b26a9a19c4c5d62fe054c14a79 ChangeLog 9582
 MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347
-MD5 a070450a725849377ac30c56eb059f9a files/xawtv-3.94-gcc4.patch 2452
+MD5 20e2255501865de5b568424821abf69d metadata.xml 161
+MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577
+MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307
 MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
-MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
 MD5 a4a5b193c0bb1d65b4c7137257e2403e files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
-MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307
-MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
+MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205
 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r2 205
+MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
+MD5 a070450a725849377ac30c56eb059f9a files/xawtv-3.94-gcc4.patch 2452

diff --git a/media-tv/xawtv/files/xawtv-3.94-no-x11.patch b/media-tv/xawtv/files/xawtv-3.94-no-x11.patch
new file mode 100644 (file)
index 0000000..d91c398
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.94-no-x11.patch
@@ -0,0 +1,20 @@
+--- xawtv-3.94/common/midictrl.c.orig  2005-07-09 15:58:53.000000000 +0200
++++ xawtv-3.94/common/midictrl.c       2005-07-09 15:59:02.000000000 +0200
+@@ -6,7 +6,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <pthread.h>
+-#include <X11/Intrinsic.h>
+ 
+ #include "grab-ng.h"
+ #include "commands.h"
+--- xawtv-3.94/common/vbi-data.c.orig  2005-07-09 15:58:53.000000000 +0200
++++ xawtv-3.94/common/vbi-data.c       2005-07-09 15:59:02.000000000 +0200
+@@ -6,7 +6,6 @@
+ #include <assert.h>
+ #include <pthread.h>
+ 
+-#include <X11/Intrinsic.h>
+ 
+ #include "vbi-data.h"
+ #include "vbi-sim.h"

diff --git a/media-tv/xawtv/xawtv-3.94-r2.ebuild b/media-tv/xawtv/xawtv-3.94-r2.ebuild
index 96bbaca89fc96e896125912025e9862726e7a842..88eb8a464d3b67d6bde6b73fc7ca81a4da0abcba 100644 (file)
--- a/media-tv/xawtv/xawtv-3.94-r2.ebuild
+++ b/media-tv/xawtv/xawtv-3.94-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94-r2.ebuild,v 1.4 2005/08/16 19:16:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.94-r2.ebuild,v 1.5 2005/10/09 12:29:17 zzam Exp $
 
 inherit virtualx eutils font
 
@@ -11,7 +11,7 @@ MY_FONT=tv-fonts-1.0
 DESCRIPTION="TV application for the bttv driver"
 HOMEPAGE="http://bytesex.org/xawtv/"
 SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
-       http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2
+       X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
        mirror://gentoo/${MY_PATCH}"
 
 SLOT="0"
@@ -37,10 +37,17 @@ DEPEND=">=sys-libs/ncurses-5.1
        sys-devel/automake
        sys-devel/libtool"
 
+pkg_setup() {
+       if use X; then
+               font_pkg_setup
+       fi
+}
+
 src_unpack() {
        unpack ${A}
        epatch ${FILESDIR}/${P}-allow-xlibs-in-normal-search-path.patch
        epatch ${FILESDIR}/${P}-gcc4.patch
+       epatch ${FILESDIR}/${P}-no-x11.patch
        cd ${S}
        autoreconf || "reconf failed"
 }
@@ -63,8 +70,10 @@ src_compile() {
 
        emake || die "Make failed"
 
-       cd ${WORKDIR}/${MY_FONT}
-       DISPLAY="" Xmake || die "tvfonts failed"
+       if use X; then
+               cd ${WORKDIR}/${MY_FONT}
+               DISPLAY="" Xmake || die "tvfonts failed"
+       fi
 }
 
 src_install() {
@@ -72,7 +81,7 @@ src_install() {
        make install DESTDIR=${D} resdir=${D}/etc/X11 || die "make install failed"
 
        dodoc COPYING Changes README* TODO ${FILESDIR}/webcamrc
-       dointo cgi-bin
+       insinto cgi-bin
        dodoc scripts/webcam.cgi
 
        use X || use xv || \
@@ -96,17 +105,21 @@ src_install() {
        mv ${D}/usr/share/*.list ${D}/usr/share/${PN}
        mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
 
-       cd ${WORKDIR}/${MY_FONT}
-       insinto /usr/share/fonts/xawtv
-       doins *.gz fonts.alias
+       if use X; then
+               cd ${WORKDIR}/${MY_FONT}
+               insinto /usr/share/fonts/xawtv
+               doins *.gz fonts.alias
 
-       font_xfont_config
-       font_xft_config
+               font_xfont_config
+               font_xft_config
+       fi
 }
 
 pkg_postinst() {
-       ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
-       cd /usr/share/fonts/xawtv
-       mkfontdir
-       eend
+       if use X; then
+               ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+               cd /usr/share/fonts/xawtv
+               mkfontdir
+               eend
+       fi
 }