many small fix0rs

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index cd909174dce8648c0c1188d432ec2eff00c0f1ec..4726caed5e00e193e972b71996685f33f287f4db 100644 (file)
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,16 +1,21 @@
 # ChangeLog for media-gfx/gphoto
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.4 2002/10/23 18:42:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.5 2002/11/06 11:38:56 seemant Exp $
 
 
 *gphoto2-2.1.0 (23 Oct 2002)
 
+  06 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gphoto2-2.0-r1.ebuild
+  gphoto2-2.1.0.ebuild :
+
+  Introduced flag-o-matic inheritance to filter out the -pipe optimisation
+  flag.  USE dependent NLS compilation. Man pages installed into FHS correct
+  locations.
+
   23 Oct 2002 ; Spider <spider@gentoo.org> gphoto2-2.1.0.ebuild :
   new ebuild introduced to bugzilla by  
   Robert Davis <rdavis@uniformcompany.com>
 
-
-
 *gphoto2-2.0-r1 (01 April 2002)
 
   19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> gphoto2-2.0-r1.ebuild :

diff --git a/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
index 05125173c01b7a8deca0f8f01d9abf6e0209658a..861eff119071a00e045c29fb2df71923dc73e552 100644 (file)
--- a/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild,v 1.9 2002/10/20 18:48:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild,v 1.10 2002/11/06 11:38:56 seemant Exp $
 
 inherit libtool
+inherit flag-o-matic
+
+IUSE="nls"
 
 MY_P=${PN}-${PV/_/}
 S=${WORKDIR}/${MY_P}
@@ -23,10 +26,13 @@ src_compile() {
        aclocal
 
        # -pipe does no work
-       env CFLAGS="${CFLAGS/-pipe/}" ./configure \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               || die
+       filter-flags -pipe
+       
+       local myconf
+
+       use nls || myconf="${myconf} --disable-nls"
+
+       econf ${myconf} || die
 
        cp libgphoto2/Makefile libgphoto2/Makefile.orig
        sed -e 's:$(prefix)/doc/gphoto2:/usr/share/doc/${PF}:' \
@@ -36,11 +42,10 @@ src_compile() {
 }
 
 src_install() {
-       make prefix=${D}/usr \
-               sysconfdir=${D}/etc \
+       einstall \
                gphotodocdir=${D}/usr/share/doc/${PF} \
                HTML_DIR=${D}/usr/share/doc/${PF}/sgml \
-               install || die
+               || die
 
        dodoc ChangeLog NEWS* README
        rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2

diff --git a/media-gfx/gphoto2/gphoto2-2.1.0.ebuild b/media-gfx/gphoto2/gphoto2-2.1.0.ebuild
index 269174888cd59e1da09234d8b8cc0643f1cbae29..3767d00c0be73378a3ea21776621787b2ef94bae 100644 (file)
--- a/media-gfx/gphoto2/gphoto2-2.1.0.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.1.0.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.0.ebuild,v 1.1 2002/10/23 18:42:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.1.0.ebuild,v 1.2 2002/11/06 11:38:56 seemant Exp $
 
 inherit libtool
+inherit flag-o-matic
+
+IUSE="nls"
 
 MY_P=${PN}-${PV/_/}
 S=${WORKDIR}/${MY_P}
@@ -24,10 +27,11 @@ src_compile() {
        aclocal
 
        # -pipe does no work
-       env CFLAGS="${CFLAGS/-pipe/}" ./configure \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               || die
+       filter-flags -pipe
+
+       local myconf
+       use nls || myconf="${myconf} --disable-nls"
+       econf ${myconf}
 
        cp libgphoto2/Makefile libgphoto2/Makefile.orig
        sed -e 's:$(prefix)/doc/gphoto2:/usr/share/doc/${PF}:' \
@@ -38,11 +42,10 @@ src_compile() {
 
 src_install() {
 
-       make prefix=${D}/usr \
-               sysconfdir=${D}/etc \
+       einstall
                gphotodocdir=${D}/usr/share/doc/${PF} \
                HTML_DIR=${D}/usr/share/doc/${PF}/sgml \
-               install || die
+               || die
 
        dodoc ChangeLog NEWS* README
        rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2