Added deprecated warning for guile (bug #181056) and pkgconfig dependency (bug #204784). Some cleaning.

(Portage version: 2.1.4_rc14)

3 files changed, 38 insertions, 20 deletions

diff --git a/sci-mathematics/drgeo/ChangeLog b/sci-mathematics/drgeo/ChangeLog
index c72ca21ea2ed..eb9e71aaf3bd 100644
--- a/sci-mathematics/drgeo/ChangeLog
+++ b/sci-mathematics/drgeo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/drgeo
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.16 2007/07/18 02:06:12 cryos Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.17 2008/01/08 00:37:47 bicatali Exp $
+
+  08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  drgeo-1.1.0.ebuild:
+  Added deprecated warning for guile (bug #181056) and pkgconfig dependency
+  (bug #204784). Some cleaning.
 
   18 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> -drgeo-1.0.0.ebuild:
   Pruned old version.
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
index 6b8a7b3fe757..3b7df92e9faf 100644
--- a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.4 2007/03/13 13:53:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.5 2008/01/08 00:37:47 bicatali Exp $
+
+inherit eutils
 
 DOCN="${PN}-doc"
 DOCV="1.5"
@@ -14,13 +16,22 @@ SRC_URI="mirror://sourceforge/ofset/${P}.tar.gz
 
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="nls no-helpbrowser"
+IUSE="nls"
 
-DEPEND=">=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/libglade-2
 	>=dev-libs/libxml2-2
-	>=dev-scheme/guile-1.4
-	!no-helpbrowser? ( www-client/dillo )"
+	>=dev-scheme/guile-1.4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if has_version =dev-scheme/guile-1.8*; then
+		built_with_use dev-scheme/guile deprecated \
+		|| die "guile must be built with deprecated use flag"
+	fi
+}
 
 src_compile() {
 	econf || die "econf failed."
@@ -28,17 +39,18 @@ src_compile() {
 	# Can't make the documentation as it depends on Hyperlatex which isn't
 	# yet in portage. Fortunately HTML is already compiled for us in the
 	# tarball and so can be installed. Just create the make install target.
-	cd ${WORKDIR}/${DOC}
+	cd "${WORKDIR}"/${DOC}
 	econf || die "docs econf failed."
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed."
-	dodoc AUTHORS ChangeLog README NEWS TODO
+	emake install DESTDIR="${D}" || die "emake install failed."
+	dodoc AUTHORS ChangeLog README NEWS TODO || die
 	if use nls; then
-		cd ${WORKDIR}/${DOC}
+		cd "${WORKDIR}"/${DOC}
 	else
-		cd ${WORKDIR}/${DOC}/c
+		cd "${WORKDIR}"/${DOC}/c
 	fi
-	make install DESTDIR=${D} || die "docs make installation failed."
+	emake install DESTDIR="${D}" || die "emake docs installation failed"
+
 }
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
index 88c64ab69d56..201e165830f5 100644
--- a/sci-mathematics/drgeo/metadata.xml
+++ b/sci-mathematics/drgeo/metadata.xml
@@ -5,11 +5,12 @@
   <maintainer>
     <email>cryos@gentoo.org</email>
   </maintainer>
-  <longdescription>
-    Dr. Geo is a GTK2 interactive geometry software. It allows one to create
-	geometric figure plus the interactive manipulation of such figure in respect
-	with their geometric constraints. It is useable in teaching situation with
-	students from primary or secondary level. It also features an integrated
-	Scheme programming language to define scripts within a figure.
+  <longdescription lang="en">
+    Dr. Geo is a GTK2 interactive geometry software. It allows one to
+    create geometric figure plus the interactive manipulation of
+    such figure in respect with their geometric constraints. It is
+    useable in teaching situation with students from primary or
+    secondary level. It also features an integrated Scheme
+    programming language to define scripts within a figure.
   </longdescription>
 </pkgmetadata>