5 files changed, 56 insertions, 32 deletions
diff --git a/media-video/xvattr/ChangeLog b/media-video/xvattr/ChangeLog
index 401d4539e8a0..710829e6ff26 100644
--- a/media-video/xvattr/ChangeLog
+++ b/media-video/xvattr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xvattr
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.12 2005/09/16 23:09:10 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.13 2006/03/07 19:12:13 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  xvattr-1.3-r1.ebuild:
+  Changed the dirty hack to disable GTK to a proper patch to xvattr so that it
+  has a --without-gtk switch. Port to modular X.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index 756b30c9acc5..cc942d7334af 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,14 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a87640d6ea0155b9bdb83b53ea7eb1b6 xvattr-1.3-r1.ebuild 1322
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 0c9aceb6a697eeca592d5ae657e99701 ChangeLog 1508
-MD5 fd84f844012dd8c0aca7748aeaf2797f files/digest-xvattr-1.3-r1 61
+MD5 eec165ef79cf71e7eb124be604611f86 ChangeLog 1730
+RMD160 e21b6bb0b9f9b5daf6ca6e921c547c6bdc932901 ChangeLog 1730
+SHA256 21107502df2fe0ab5b9c2fcf3aff00e99d1e60a0bfce668abf61349d7d123bef ChangeLog 1730
+MD5 3f61f3a77e3d662c86c88056a6107bc8 files/digest-xvattr-1.3-r1 482
+RMD160 66b0b90a95f273436b79cb6e86989f138e657e74 files/digest-xvattr-1.3-r1 482
+SHA256 848ed1a8e05a731e52862b008ed13b68b76568dd4a70b1bde10f6337b8efc862 files/digest-xvattr-1.3-r1 482
+MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
+RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
+SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
+MD5 d8684e099c6cf53b724656955f0c0919 xvattr-1.3-r1.ebuild 1060
+RMD160 2935e21f28ade92ae4e86168925f430869e315a8 xvattr-1.3-r1.ebuild 1060
+SHA256 e8f426ab7c72f54ef4b305df49bc506989278ad9b82716cc1d5805e7360ee1c7 xvattr-1.3-r1.ebuild 1060
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDK1DKLLFUmVNQ7rkRAoQWAKDDPJNxkWiI+MgYoCm2QHqhsnK5oACgjC6h
-+/BzfP0bK1Z+MUdjJJSSloI=
-=b/61
+iD8DBQFEDdsaAiZjviIA2XgRAqCuAKCw9OnWsLGKFrD0VEkqaAMGvWwcpACdFUV5
+9M69jasMZWgyjHejvgodYf4=
+=sUtJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/xvattr/files/digest-xvattr-1.3-r1 b/media-video/xvattr/files/digest-xvattr-1.3-r1
index ae65d1b9bb94..fe6246ff9fcf 100644
--- a/media-video/xvattr/files/digest-xvattr-1.3-r1
+++ b/media-video/xvattr/files/digest-xvattr-1.3-r1
@@ -1 +1,6 @@
+MD5 e02af33bcd7c28d359c8fbb4cb9d99ef xvattr-1.3-nogtk.patch.bz2 3917
+RMD160 3656c765177084eb285ad3b9e9223071dccd2981 xvattr-1.3-nogtk.patch.bz2 3917
+SHA256 3a9e167b49f389b3e6e3a77b4576027baaa87219255210e86940a0f1b0f9a785 xvattr-1.3-nogtk.patch.bz2 3917
 MD5 041e0d1f2ebce216e69e08ce78ec2ceb xvattr-1.3.tar.gz 82263
+RMD160 14dc247eb31e2eb7947089cebebba4443ef01ee0 xvattr-1.3.tar.gz 82263
+SHA256 1cedc0b4795e6f4234b1d52172f74d7163ecb8142fbb35dc86c905df5478d8fa xvattr-1.3.tar.gz 82263
diff --git a/media-video/xvattr/metadata.xml b/media-video/xvattr/metadata.xml
index 1cadc2e4ec21..edccfe5754d2 100644
--- a/media-video/xvattr/metadata.xml
+++ b/media-video/xvattr/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>video</herd>
 <maintainer>
-  <email>media-video@gentoo.org</email>
+<email>media-video@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/xvattr/xvattr-1.3-r1.ebuild b/media-video/xvattr/xvattr-1.3-r1.ebuild
index 0310b665fbe9..b761783d2abb 100644
--- a/media-video/xvattr/xvattr-1.3-r1.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r1.ebuild
@@ -1,37 +1,43 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.8 2005/07/28 12:05:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.9 2006/03/07 19:12:13 flameeyes Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
+SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz
+	mirror://gentoo/${P}-nogtk.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="gtk"
 
-DEPEND="virtual/x11
-	gtk? ( =x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2* )"
+RDEPEND="
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXv
+			x11-libs/libXext
+		) virtual/x11 )
+	gtk? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
-	# If no gtk then modify the necessary parts so that gtk isn't needed anymore
-	if ! use gtk
-	then
-	    cd ${S}
-	    rm Makefile.in
-	    cp Makefile.am Makefile.am.orig
-	    sed -e "s/bin_PROGRAMS = xvattr gxvattr/bin_PROGRAMS = xvattr/" -e "s/gxvattr_SOURCES = gxvattr.c//" -e "s/CFLAGS = @GTK_CFLAGS@//" -e "s/gxvattr_LDADD = @GTK_LIBS@ \$(X_LIBS) \$(X_PRE_LIBS) \$(X_EXTRA_LIBS) -lX11 -lXext//" Makefile.am.orig >Makefile.am
-	    rm Makefile.am.orig
-
-	    cp configure.in configure.in.orig
-	    sed -e "s/dnl check for gtk//" -e "s/AM_PATH_GTK//" configure.in.orig >configure.in
-	    rm configure.in.orig
-	    automake
-	    autoconf
-	fi
+	cd ${S}
+
+	epatch "${DISTDIR}/${P}-nogtk.patch.bz2"
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_compile() {
+	econf $(use_with gtk) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {