new version

8 files changed, 6 insertions, 82 deletions

diff --git a/media-gfx/gphoto/ChangeLog b/media-gfx/gphoto/ChangeLog
index 1b1324b11b71..a84a04de7095 100644
--- a/media-gfx/gphoto/ChangeLog
+++ b/media-gfx/gphoto/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for media-gfx/gphoto
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/ChangeLog,v 1.2 2002/03/11 23:48:08 azarah Exp $
+
+*gphoto-2.0 (11 March 2002)
 
 *gphoto-2.0_beta3 (1 Feb 2002)
 
diff --git a/media-gfx/gphoto/files/digest-gphoto-2.0 b/media-gfx/gphoto/files/digest-gphoto-2.0
new file mode 100644
index 000000000000..cc8b6c304bbe
--- /dev/null
+++ b/media-gfx/gphoto/files/digest-gphoto-2.0
@@ -0,0 +1 @@
+MD5 f958d3c4b7238a8d6f1827da0d708941 gphoto2-2.0.tar.gz 1705979
diff --git a/media-gfx/gphoto/files/digest-gphoto-2.0_beta1 b/media-gfx/gphoto/files/digest-gphoto-2.0_beta1
deleted file mode 100644
index a2d8c47bb98c..000000000000
--- a/media-gfx/gphoto/files/digest-gphoto-2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6c0ec7ac7ee34486440637ee48d09a7 gphoto-2.0beta1.tar.gz 606938
diff --git a/media-gfx/gphoto/files/digest-gphoto-2.0_beta2 b/media-gfx/gphoto/files/digest-gphoto-2.0_beta2
deleted file mode 100644
index 024c41a85579..000000000000
--- a/media-gfx/gphoto/files/digest-gphoto-2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2895917f1a34b60d9db36cc9bf4ffd9 gphoto-2.0beta2.tar.gz 944082
diff --git a/media-gfx/gphoto/files/digest-gphoto-2.0_beta3 b/media-gfx/gphoto/files/digest-gphoto-2.0_beta3
deleted file mode 100644
index abb7f21b48a6..000000000000
--- a/media-gfx/gphoto/files/digest-gphoto-2.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4a68ed54c189de5fd9f460bd1bc2743 gphoto-2.0beta3.tar.gz 1112579
diff --git a/media-gfx/gphoto/gphoto-2.0_beta2.ebuild b/media-gfx/gphoto/gphoto-2.0.ebuild
index c787c26c0d00..ad519164e6f9 100644
--- a/media-gfx/gphoto/gphoto-2.0_beta2.ebuild
+++ b/media-gfx/gphoto/gphoto-2.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <aj@gentoo.org>
 
-MY_P="${PN}-`echo ${PV} |sed -e 's:_::'`"
+MY_P="${PN}2-`echo ${PV} |sed -e 's:_::'`"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="free, redistributable digital camera software application"
 SRC_URI="http://www.gphoto.net/dist/${MY_P}.tar.gz"
 HOMEPAGE="http://www.gphoto.org/"
 
 DEPEND="virtual/glibc
-	>=dev-libs/libusb-0.1.3b
+	>=dev-libs/libusb-0.1.5
 	>=dev-libs/glib-1.2.10
 	>=sys-libs/zlib-1.1.3"
 
diff --git a/media-gfx/gphoto/gphoto-2.0_beta1.ebuild b/media-gfx/gphoto/gphoto-2.0_beta1.ebuild
deleted file mode 100644
index 1a8b927f369d..000000000000
--- a/media-gfx/gphoto/gphoto-2.0_beta1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-2.0_beta1.ebuild,v 1.3 2001/08/11 04:34:35 drobbins Exp $
-
-A=${PN}-2.0beta1.tar.gz
-S=${WORKDIR}/${PN}-2.0beta1
-DESCRIPTION="free, redistributable digital camera software application"
-SRC_URI="http://www.gphoto.net/dist/${A}"
-HOMEPAGE="http://www.gphoto.org"
-
-DEPEND="virtual/glibc >=dev-libs/libusb-0.1.3b >=dev-libs/glib-1.2.10 >=sys-libs/zlib-1.1.3"
-
-
-src_compile() {
-
-   # -pipe does no work
-   cd libgphoto2_port
-   try CFLAGS="${CFLAGS/-pipe/}" ./configure --prefix=/usr --sysconfdir=/etc
-   cd ..
-   try CFLAGS="${CFLAGS/-pipe/}" ./configure --prefix=/usr --sysconfdir=/etc
-   try pmake
-}
-
-src_install() {
-    try make prefix=${D}/usr sysconfdir=${D}/etc  install
-    dodoc ChangeLog NEWS* README
-    mv ${D}/usr/share/gphoto2/html ${D}/usr/share/doc/${PF}/sgml
-    mv ${D}/usr/doc/gphoto2/* ${D}/usr/share/doc/${PF}
-    rm -rf ${D}/usr/share/gphoto2 ${D}/usr/share/doc/${PF}/sgml/gphoto2 ${D}/usr/doc
-    prepalldocs
-}
-
diff --git a/media-gfx/gphoto/gphoto-2.0_beta3.ebuild b/media-gfx/gphoto/gphoto-2.0_beta3.ebuild
deleted file mode 100644
index c787c26c0d00..000000000000
--- a/media-gfx/gphoto/gphoto-2.0_beta3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author AJ Lewis <aj@gentoo.org>
-
-MY_P="${PN}-`echo ${PV} |sed -e 's:_::'`"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="free, redistributable digital camera software application"
-SRC_URI="http://www.gphoto.net/dist/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gphoto.org/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/libusb-0.1.3b
-	>=dev-libs/glib-1.2.10
-	>=sys-libs/zlib-1.1.3"
-
-
-src_compile() {
-
-	# -pipe does no work
-	env CFLAGS="${CFLAGS/-pipe/}" ./configure		\
-		--prefix=/usr					\
-		--sysconfdir=/etc				\
-		|| die
-
-	cp libgphoto2/Makefile libgphoto2/Makefile.orig
-	sed -e 's:$(prefix)/doc/gphoto2:/usr/share/doc/${PF}:'	\
-		libgphoto2/Makefile.orig >libgphoto2/Makefile
-
-	make || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr					\
-		sysconfdir=${D}/etc				\
-		gphotodocdir=${D}/usr/share/doc/${PF}		\
-		HTML_DIR=${D}/usr/share/doc/${PF}/sgml		\
-		install || die
-	
-	dodoc ChangeLog NEWS* README
-	rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2
-}
-