Porting to modular X

(Portage version: 2.0.53)

7 files changed, 33 insertions, 32 deletions

diff --git a/media-video/motioneye/ChangeLog b/media-video/motioneye/ChangeLog
index e883f7841a0a..ebc173cbb779 100644
--- a/media-video/motioneye/ChangeLog
+++ b/media-video/motioneye/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/motioneye
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.5 2005/08/26 12:41:06 phosphan Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.6 2006/01/23 11:24:05 phosphan Exp $
+
+*motioneye-1.3-r1 (23 Jan 2006)
+
+  23 Jan 2006; Patrick Kursawe <phosphan@gentoo.org>
+  -files/motioneye-1.2-Makefile.diff, -motioneye-1.2.ebuild,
+  +motioneye-1.3-r1.ebuild:
+  Porting to modular X
 
 *motioneye-1.3 (26 Aug 2005)
 
diff --git a/media-video/motioneye/Manifest b/media-video/motioneye/Manifest
index 74a651333854..21a3e4886d04 100644
--- a/media-video/motioneye/Manifest
+++ b/media-video/motioneye/Manifest
@@ -1,7 +1,6 @@
-MD5 792b7cbf60861363950860d8d46a8244 motioneye-1.2.ebuild 719
-MD5 719e51dfb3a5f4a7abb8acb952a6a436 motioneye-1.3.ebuild 765
 MD5 4362173e8e3593d6f664b681384cf7e1 ChangeLog 775
-MD5 f935ca6b6e2481293e6beb9700c64cd0 metadata.xml 347
-MD5 128dd9baaab4670b680bf36e89000f0a files/digest-motioneye-1.2 64
 MD5 8878fa14a38030a03298f40afce05702 files/digest-motioneye-1.3 64
-MD5 0d53ead4c9f82be6444880b879181c1d files/motioneye-1.2-Makefile.diff 476
+MD5 8878fa14a38030a03298f40afce05702 files/digest-motioneye-1.3-r1 64
+MD5 f935ca6b6e2481293e6beb9700c64cd0 metadata.xml 347
+MD5 c89ad0e11ed89a74bdb2b593445ee5ab motioneye-1.3-r1.ebuild 879
+MD5 719e51dfb3a5f4a7abb8acb952a6a436 motioneye-1.3.ebuild 765
diff --git a/media-video/motioneye/files/digest-motioneye-1.2 b/media-video/motioneye/files/digest-motioneye-1.2
deleted file mode 100644
index 70787904b617..000000000000
--- a/media-video/motioneye/files/digest-motioneye-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 282c9dfb3fc6b3d51530a97d5fbf5658 motioneye-1.2.tar.bz2 6994
diff --git a/media-video/motioneye/files/digest-motioneye-1.3-r1 b/media-video/motioneye/files/digest-motioneye-1.3-r1
new file mode 100644
index 000000000000..c010e62628dc
--- /dev/null
+++ b/media-video/motioneye/files/digest-motioneye-1.3-r1
@@ -0,0 +1 @@
+MD5 b0ea7e98f106f08ecdea0dd05f30a152 motioneye-1.3.tar.bz2 8816
diff --git a/media-video/motioneye/files/motioneye-1.2-Makefile.diff b/media-video/motioneye/files/motioneye-1.2-Makefile.diff
deleted file mode 100644
index 262058e7946f..000000000000
--- a/media-video/motioneye/files/motioneye-1.2-Makefile.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile	2001-06-06 09:37:43.000000000 +0100
-+++ Makefile.new	2003-09-06 20:56:57.000000000 +0100
-@@ -1,10 +1,10 @@
--CFLAGS = -Wall -Wstrict-prototypes -O2 -I/usr/X11R6/include -I/usr/src/linux/include
-+CFLAGS = -Wall -Wstrict-prototypes -O2 -I/usr/X11R6/include -I/usr/include
- SRC = motioneye.c avi.c display.c
- OBJ = $(SRC:.c=.o)
- LIBS =
- 
- # comment out WITH_X if you don't want X display
--WITH_X = yes
-+WITH_X = ${WITHX}
- 
- ifeq ($(WITH_X),yes)
-   CFLAGS += -DWITH_X
diff --git a/media-video/motioneye/motioneye-1.2.ebuild b/media-video/motioneye/motioneye-1.3-r1.ebuild
index f007d1d3efc2..62355f0df3e2 100644
--- a/media-video/motioneye/motioneye-1.2.ebuild
+++ b/media-video/motioneye/motioneye-1.3-r1.ebuild
@@ -1,28 +1,38 @@
-# 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/motioneye/motioneye-1.2.ebuild,v 1.5 2005/08/26 12:41:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3-r1.ebuild,v 1.1 2006/01/23 11:24:06 phosphan Exp $
 
 inherit eutils
 
 DESCRIPTION="ppm, jpeg or mjpeg grabber for the MotionEye camera on Sony VAIO Picturebooks."
-HOMEPAGE="http://spop.free.fr/meye/"
-SRC_URI="http://spop.free.fr/meye/${P}.tar.bz2"
+HOMEPAGE="http://popies.net/meye/"
+SRC_URI="http://popies.net/meye/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="X"
-DEPEND="X? ( virtual/x11
+RDEPEND="X? ( || (
+					virtual/x11
+					x11-libs/libX11
+				)
 		media-libs/imlib )"
 
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	X? || (
+		x11-proto/xextproto
+		virtual/x11
+		)
+	app-text/docbook-sgml-utils"
+
 src_compile() {
 	cd ${S}
-	epatch ${FILESDIR}/${P}-Makefile.diff
 	if use X; then
 		export WITHX='yes'
 	else
 		export WITHX='no'
 	fi
-	make || die
+	emake WITH_X="${WITHX}" CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/media-video/motioneye/motioneye-1.3.ebuild b/media-video/motioneye/motioneye-1.3.ebuild
index 9315db116cc8..a22c984d4f13 100644
--- a/media-video/motioneye/motioneye-1.3.ebuild
+++ b/media-video/motioneye/motioneye-1.3.ebuild
@@ -1,6 +1,6 @@
-# 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/motioneye/motioneye-1.3.ebuild,v 1.1 2005/08/26 12:41:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3.ebuild,v 1.2 2006/01/23 11:24:06 phosphan Exp $
 
 inherit eutils