6 files changed, 94 insertions, 7 deletions
diff --git a/media-video/goggles/ChangeLog b/media-video/goggles/ChangeLog
index 0361ba7e1f91..fd721d8d05ae 100644
--- a/media-video/goggles/ChangeLog
+++ b/media-video/goggles/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/goggles
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/ChangeLog,v 1.2 2004/09/03 00:59:00 dholm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/ChangeLog,v 1.3 2005/02/05 00:56:07 luckyduck Exp $
+
+*goggles-0.7.4-r1 (05 Feb 2005)
+
+  05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +goggles-0.7.4-r1.ebuild,
+  goggles-0.7.4.ebuild:
+  added ~amd64 to KEYWORDS. added enhancements suggested by Przemyslaw Maciag
+  <p_maciag@wp.pl>. fixes #80808 and #61844
 
   03 Sep 2004; David Holm <dholm@gentoo.org> goggles-0.7.4.ebuild:
   Added to ~ppc.
diff --git a/media-video/goggles/Manifest b/media-video/goggles/Manifest
index bb0b2d2392c1..f2bdc43779df 100644
--- a/media-video/goggles/Manifest
+++ b/media-video/goggles/Manifest
@@ -1,4 +1,7 @@
-MD5 d1bc3318149c3291ad385462152d0369 ChangeLog 446
+MD5 4797c2c05ed335e126d2cbcc1020c13c goggles-0.7.4-r1.ebuild 1215
+MD5 cd709243cba6718b3cc330874be93d53 ChangeLog 708
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 64b8fc00c008f8aad8edeb31df3826a0 goggles-0.7.4.ebuild 929
+MD5 5915541c79f66f14470adffd489009e2 goggles-0.7.4.ebuild 940
+MD5 5f4a7441d17566f5347a2e65d589e863 files/goggles-0.7.4-gentoo.patch 874
 MD5 24eefdf711e3a7ce5e095b5b989741b8 files/digest-goggles-0.7.4 66
+MD5 24eefdf711e3a7ce5e095b5b989741b8 files/digest-goggles-0.7.4-r1 66
diff --git a/media-video/goggles/files/digest-goggles-0.7.4-r1 b/media-video/goggles/files/digest-goggles-0.7.4-r1
new file mode 100644
index 000000000000..a1aedb64e22e
--- /dev/null
+++ b/media-video/goggles/files/digest-goggles-0.7.4-r1
@@ -0,0 +1 @@
+MD5 d0ef875a6559829ba131bfc0d3b2bfdf goggles-0.7.4.tar.bz2 704793
diff --git a/media-video/goggles/files/goggles-0.7.4-gentoo.patch b/media-video/goggles/files/goggles-0.7.4-gentoo.patch
new file mode 100644
index 000000000000..20259cf2a854
--- /dev/null
+++ b/media-video/goggles/files/goggles-0.7.4-gentoo.patch
@@ -0,0 +1,25 @@
+--- desktop/goggles.desktop.orig	2004-08-25 23:42:44.157306560 +0000
++++ desktop/goggles.desktop	2004-08-25 23:46:07.196439920 +0000
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Name=Goggles DVD player
++Name[pl]=Odtwarzacz DVD goggles
+ Comment=FOX Frontend for Ogle DVD Player
++Comment[pl]=Nakładka graficzna dla odtwarzacza DVD Ogle
+ Exec=goggles
+-Icon=oggles.png
++Icon=goggles.png
+ Terminal=0
+ Type=Application
+ DocPath=
+--- build/config.linux.orig	2004-08-26 00:03:07.056397640 +0000
++++ build/config.linux	2004-08-26 00:04:23.931710816 +0000
+@@ -25,7 +25,7 @@
+ 
+ # Libraries we need
+ #----------------------------------------------------------------------------------------------------------------
+-OGLE_INCLUDE="-I$OGLE_PREFIX/include"
++OGLE_INCLUDE="-I$OGLE_PREFIX/include/ogle"
+ OGLE_LIB="-L$OGLE_PREFIX/lib/ogle -Wl,-rpath $OGLE_PREFIX/lib/ogle -ldvdcontrol -lmsgevents"
+ 
+ 
diff --git a/media-video/goggles/goggles-0.7.4-r1.ebuild b/media-video/goggles/goggles-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..e5e1110c425b
--- /dev/null
+++ b/media-video/goggles/goggles-0.7.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.7.4-r1.ebuild,v 1.1 2005/02/05 00:56:07 luckyduck Exp $
+
+inherit eutils gcc
+
+DESCRIPTION="User-friendly frontend for the Ogle DVD Player"
+HOMEPAGE="http://www.fifthplanet.net/goggles.html"
+SRC_URI="http://www.fifthplanet.net/files/goggles-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc"
+
+DEPEND=">=x11-libs/fox-1.2
+	>=media-video/ogle-0.9.2
+	media-libs/libpng"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	sed -i \
+		-e "/^export CC=/s:=.*:=\"$(gcc-getCC)\":" \
+		-e "/^export CXX=/s:=.*:=\"$(gcc-getCXX)\":" \
+		-e "/^export CFLAGS=/s:=.*:=\"${CFLAGS}\":" \
+		-e "/^export CXXFLAGS=/s:=.*:=\"${CXXFLAGS}\":" \
+		build/config.linux
+}
+
+src_compile() {
+	./gb || die "build failed"
+}
+
+src_install() {
+	dobin ${S}/scripts/goggles
+	dobin ${S}/src/ogle_gui_goggles
+
+	if use doc; then
+		dodoc ${S}/desktop/goggles_manual.pdf
+	fi
+
+	insinto /usr/share/applications
+	doins ${S}/desktop/${PN}.desktop
+
+	insinto /usr/share/pixmaps
+	newins ${S}/icons/goggleslogosmall_png.png goggles.png
+}
diff --git a/media-video/goggles/goggles-0.7.4.ebuild b/media-video/goggles/goggles-0.7.4.ebuild
index 2420919cf11e..fba2ebb349cc 100644
--- a/media-video/goggles/goggles-0.7.4.ebuild
+++ b/media-video/goggles/goggles-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.7.4.ebuild,v 1.2 2004/09/03 00:59:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.7.4.ebuild,v 1.3 2005/02/05 00:56:07 luckyduck Exp $
 
 inherit gcc
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.fifthplanet.net/files/goggles-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND=">=x11-libs/fox-1.2