Port to GTK+-2.0.

Package-Manager: portage-2.1.3.3

5 files changed, 107 insertions, 5 deletions

diff --git a/media-video/xvattr/ChangeLog b/media-video/xvattr/ChangeLog
index faaa55ce371f..c821392ea47e 100644
--- a/media-video/xvattr/ChangeLog
+++ b/media-video/xvattr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/xvattr
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.18 2007/07/22 08:29:17 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.19 2007/08/11 09:38:35 drac Exp $
+
+*xvattr-1.3-r2 (11 Aug 2007)
+
+  11 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xvattr-1.3-gtk.patch, +xvattr-1.3-r2.ebuild:
+  Port to GTK+-2.0.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xvattr-1.3-r1.ebuild:
   Drop virtual/x11 references.
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index 6e3facedb11c..fbc275eea41a 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,13 +1,21 @@
+AUX xvattr-1.3-gtk.patch 1238 RMD160 7230165364f7eaf899f69a7862ee479c9dff4afc SHA1 16d96e566ace25284ab4b48e82b3fde7850b18bb SHA256 1e32458446902c00a28c9b2075ee8a5043c78143cabf44c2b2706528e2a6fc2f
+MD5 9f754c4c026bf75d1c789fa45d4a714b files/xvattr-1.3-gtk.patch 1238
+RMD160 7230165364f7eaf899f69a7862ee479c9dff4afc files/xvattr-1.3-gtk.patch 1238
+SHA256 1e32458446902c00a28c9b2075ee8a5043c78143cabf44c2b2706528e2a6fc2f files/xvattr-1.3-gtk.patch 1238
 DIST xvattr-1.3-nogtk.patch.bz2 3917 RMD160 3656c765177084eb285ad3b9e9223071dccd2981 SHA1 75a25e70e568b6f28c4128f055f49bcaac8fce44 SHA256 3a9e167b49f389b3e6e3a77b4576027baaa87219255210e86940a0f1b0f9a785
 DIST xvattr-1.3.tar.gz 82263 RMD160 14dc247eb31e2eb7947089cebebba4443ef01ee0 SHA1 6f6743aa7a1696727cc83bdf77e2baa63c090750 SHA256 1cedc0b4795e6f4234b1d52172f74d7163ecb8142fbb35dc86c905df5478d8fa
 EBUILD xvattr-1.3-r1.ebuild 1057 RMD160 2b93b3cb65b29a0a6d4b8bec9ff4d82a7db766c8 SHA1 f9cef217686f73d4b9e51a230e42434f836af767 SHA256 219a4164e1a22854b33d31952d77cefa105814c3d3cde8bd6519ef6aa39a927a
 MD5 49f066108be22f28c43c41592c820aae xvattr-1.3-r1.ebuild 1057
 RMD160 2b93b3cb65b29a0a6d4b8bec9ff4d82a7db766c8 xvattr-1.3-r1.ebuild 1057
 SHA256 219a4164e1a22854b33d31952d77cefa105814c3d3cde8bd6519ef6aa39a927a xvattr-1.3-r1.ebuild 1057
-MISC ChangeLog 2333 RMD160 95c57c182998e9c8d449059de2eacada41d7a6d8 SHA1 fea489200fd002d5e288ad0a2e8b7c79df110743 SHA256 9c0fbdeadabd91e750f23e5734c1c488ef316151b1aff6ff063025cd68666684
-MD5 0844f1d1736a990d591ec3ffeb010881 ChangeLog 2333
-RMD160 95c57c182998e9c8d449059de2eacada41d7a6d8 ChangeLog 2333
-SHA256 9c0fbdeadabd91e750f23e5734c1c488ef316151b1aff6ff063025cd68666684 ChangeLog 2333
+EBUILD xvattr-1.3-r2.ebuild 896 RMD160 9070ae084af5fa25116e03b366a538cae38b785c SHA1 3f86917490805d2b38de30d72041cbf01359bf45 SHA256 55ef0e2ee8cd2c363ce7d94649482b7a59fb9500e43402c63d8ad3803ed620b7
+MD5 0f52a1f19921eefd66c480b9ae6192de xvattr-1.3-r2.ebuild 896
+RMD160 9070ae084af5fa25116e03b366a538cae38b785c xvattr-1.3-r2.ebuild 896
+SHA256 55ef0e2ee8cd2c363ce7d94649482b7a59fb9500e43402c63d8ad3803ed620b7 xvattr-1.3-r2.ebuild 896
+MISC ChangeLog 2482 RMD160 d261e5621e71b10c0b2034de87f45e2324e2df2b SHA1 88fdf2a5c225a819d3d5d8647ea3cae9bb861c8f SHA256 c07308aaed2af5971e03f99859890fdb76e2e6eb3f71aa658f07b7ded61660cd
+MD5 5aa37502be6c6dc8d8616e768f09cffc ChangeLog 2482
+RMD160 d261e5621e71b10c0b2034de87f45e2324e2df2b ChangeLog 2482
+SHA256 c07308aaed2af5971e03f99859890fdb76e2e6eb3f71aa658f07b7ded61660cd ChangeLog 2482
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -15,3 +23,6 @@ SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata
 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 270be161346ffca020f5bd3bfc6e4a5e files/digest-xvattr-1.3-r2 229
+RMD160 8533644a70cd7990b6cd757eed86d0ee4b4bef2d files/digest-xvattr-1.3-r2 229
+SHA256 d65d7d14d959c11838eb20d49f86ce85c5ff7e1acbd1f10a16a0972221b9b39d files/digest-xvattr-1.3-r2 229
diff --git a/media-video/xvattr/files/digest-xvattr-1.3-r2 b/media-video/xvattr/files/digest-xvattr-1.3-r2
new file mode 100644
index 000000000000..863e412a0093
--- /dev/null
+++ b/media-video/xvattr/files/digest-xvattr-1.3-r2
@@ -0,0 +1,3 @@
+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/files/xvattr-1.3-gtk.patch b/media-video/xvattr/files/xvattr-1.3-gtk.patch
new file mode 100644
index 000000000000..2545aaddbf9f
--- /dev/null
+++ b/media-video/xvattr/files/xvattr-1.3-gtk.patch
@@ -0,0 +1,44 @@
+diff -ur xvattr-1.3.orig/configure.in xvattr-1.3/configure.in
+--- xvattr-1.3.orig/configure.in	2002-06-13 22:40:33.000000000 +0300
++++ xvattr-1.3/configure.in	2007-08-11 12:29:54.000000000 +0300
+@@ -17,7 +17,14 @@
+ AC_PATH_XTRA
+ 
+ dnl check for gtk
+-AM_PATH_GTK
++AC_ARG_WITH(gtk,
++       [--without-gtk     Disable GTK support (default: enabled)])
++if test "x$with_gtk" != "xno"; then
++       AM_PATH_GTK_2_0
++else
++       no_gtk="yes"
++fi
++AM_CONDITIONAL(WITH_GTK, [test "x$no_gtk" != "xyes"])
+ 
+ dnl Checks for libraries.
+ AC_ARG_WITH(xv-path,[  --with-xv-path=path    Where libXv is installed],
+diff -ur xvattr-1.3.orig/Makefile.am xvattr-1.3/Makefile.am
+--- xvattr-1.3.orig/Makefile.am	2002-06-13 22:22:00.000000000 +0300
++++ xvattr-1.3/Makefile.am	2007-08-11 12:31:42.000000000 +0300
+@@ -1,12 +1,19 @@
+ # 
+ 
+-bin_PROGRAMS = xvattr gxvattr
++if WITH_GTK
++gtk_programs = gxvattr
++endif
++
++bin_PROGRAMS = xvattr $(gtk_programs)
++
+ xvattr_SOURCES = xvattr.c
+ 
+ xvattr_LDADD = $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lXext @LIBOBJS@
+ 
+ gxvattr_SOURCES = gxvattr.c
+-CFLAGS = @GTK_CFLAGS@
++
++gxvattr_CFLAGS = @GTK_CFLAGS@
++
+ gxvattr_LDADD = @GTK_LIBS@ $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lXext
+ noinst_HEADERS = getopt.h
+ 
diff --git a/media-video/xvattr/xvattr-1.3-r2.ebuild b/media-video/xvattr/xvattr-1.3-r2.ebuild
new file mode 100644
index 000000000000..eb012201dc2b
--- /dev/null
+++ b/media-video/xvattr/xvattr-1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r2.ebuild,v 1.1 2007/08/11 09:38:35 drac 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"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXext
+	gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gtk.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_with gtk)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+}