QA: the nox11 patch failed to apply and was totally bogus (patched Makefile.in only); drop the X USE flag, forcing it enabled, which is the only working configuration for SLOT=1 ebuild.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 13 insertions, 66 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 04c6199a9e29..cfa946a71db8 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdc1394
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.53 2010/06/10 03:04:43 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.54 2011/03/21 14:23:54 flameeyes Exp $
+
+  21 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/libdc1394-1.2.1-nox11.patch, libdc1394-1.2.2.ebuild:
+  QA: the nox11 patch failed to apply and was totally bogus (patched
+  Makefile.in only); drop the X USE flag, forcing it enabled, which is the only
+  working configuration for SLOT=1 ebuild.
 
   10 Jun 2010; Jeroen Roovers <jer@gentoo.org> libdc1394-1.2.2.ebuild,
   libdc1394-2.1.2.ebuild:
diff --git a/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch b/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch
deleted file mode 100644
index cbbb5c4aaa5b..000000000000
--- a/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN libdc1394-1.2.1.orig/examples/Makefile.in libdc1394-1.2.1/examples/Makefile.in
---- libdc1394-1.2.1.orig/examples/Makefile.in	2006-03-31 06:53:44.000000000 +0200
-+++ libdc1394-1.2.1/examples/Makefile.in	2006-05-07 09:59:31.000000000 +0200
-@@ -38,7 +38,7 @@
- host_triplet = @host@
- bin_PROGRAMS = dc1394_vloopback$(EXEEXT)
- noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \
--	dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT)
-+	grab_color_image$(EXEEXT)
- subdir = examples
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,13 +51,7 @@
- am__installdirs = "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
--am_dc1394_multiview_OBJECTS =  \
--	dc1394_multiview-dc1394_multiview.$(OBJEXT)
--dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS)
- am__DEPENDENCIES_1 =
--dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
- am_dc1394_vloopback_OBJECTS = dc1394_vloopback.$(OBJEXT) \
- 	affine.$(OBJEXT)
- dc1394_vloopback_OBJECTS = $(am_dc1394_vloopback_OBJECTS)
-@@ -82,10 +76,10 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
-+SOURCES = $(dc1394_vloopback_SOURCES) \
- 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
- 	$(grab_partial_image_SOURCES)
--DIST_SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
-+DIST_SOURCES = $(dc1394_vloopback_SOURCES) \
- 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
- 	$(grab_partial_image_SOURCES)
- ETAGS = etags
-@@ -202,8 +196,6 @@
- grab_partial_image_SOURCES = grab_partial_image.c
- grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
- dc1394_multiview_CFLAGS = $(X_CFLAGS)
--dc1394_multiview_SOURCES = dc1394_multiview.c
--dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 $(X_LIBS) $(X_PRE_LIBS) -lXv -lXext -lX11 $(X_EXTRA_LIBS)
- dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h
- dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394
- all: all-am
-@@ -276,7 +268,7 @@
- 	done
- dc1394_multiview$(EXEEXT): $(dc1394_multiview_OBJECTS) $(dc1394_multiview_DEPENDENCIES) 
- 	@rm -f dc1394_multiview$(EXEEXT)
--	$(LINK) $(dc1394_multiview_LDFLAGS) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS)
-+	$(LINK) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS)
- dc1394_vloopback$(EXEEXT): $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_DEPENDENCIES) 
- 	@rm -f dc1394_vloopback$(EXEEXT)
- 	$(LINK) $(dc1394_vloopback_LDFLAGS) $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_LDADD) $(LIBS)
diff --git a/media-libs/libdc1394/libdc1394-1.2.2.ebuild b/media-libs/libdc1394/libdc1394-1.2.2.ebuild
index 97b3059e36f6..bbf2721d4fbc 100644
--- a/media-libs/libdc1394/libdc1394-1.2.2.ebuild
+++ b/media-libs/libdc1394/libdc1394-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.2.ebuild,v 1.8 2010/06/10 03:04:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.2.ebuild,v 1.9 2011/03/21 14:23:54 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,18 +11,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="X"
+IUSE=""
 
 RDEPEND="sys-libs/libraw1394
-		X? ( x11-libs/libSM x11-libs/libXv )"
+	x11-libs/libSM
+	x11-libs/libXv"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A}; cd "${S}"
-	if ! use X; then
-		epatch "${FILESDIR}"/${PN}-1.2.1-nox11.patch
-	fi
 	epatch "${FILESDIR}"/${PN}-disable-raw-capture.patch
 }