Version Bump, #400733; add missing deps

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 158 insertions, 8 deletions

diff --git a/sci-chemistry/chemtool/ChangeLog b/sci-chemistry/chemtool/ChangeLog
index 5542ae4a9241..3b28be24be29 100644
--- a/sci-chemistry/chemtool/ChangeLog
+++ b/sci-chemistry/chemtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/chemtool
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.31 2011/05/23 15:18:31 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.32 2012/01/26 18:38:30 jlec Exp $
+
+*chemtool-1.6.13 (26 Jan 2012)
+
+  26 Jan 2012; Justin Lecher <jlec@gentoo.org>
+  +files/1.6.13-no-underlinking.patch, chemtool-1.6.12.ebuild,
+  chemtool-1.6.12-r1.ebuild, +chemtool-1.6.13.ebuild, metadata.xml:
+  Version Bump, #400733; add missing deps
 
 *chemtool-1.6.12-r1 (23 May 2011)
 
diff --git a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild
index d4e4e835c64c..6d25c0ddf643 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild,v 1.1 2011/05/23 15:18:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild,v 1.2 2012/01/26 18:38:30 jlec Exp $
 
 EAPI=4
 
@@ -16,8 +16,11 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="emf gnome nls"
 
 RDEPEND="
+	dev-libs/glib:2
 	media-gfx/transfig
 	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
 	emf? ( media-libs/libemf )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12.ebuild
index 6093bf8c8d6e..4a726ae34acd 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12.ebuild,v 1.6 2011/05/23 15:18:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12.ebuild,v 1.7 2012/01/26 18:38:30 jlec Exp $
 
 EAPI=1
 
@@ -16,8 +16,11 @@ KEYWORDS="amd64 ppc x86"
 IUSE="gnome nls"
 
 RDEPEND="
+	dev-libs/glib:2
 	media-gfx/transfig
 	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
 	x86? ( media-libs/libemf )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
new file mode 100644
index 000000000000..d9a518ce33de
--- /dev/null
+++ b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.13.ebuild,v 1.1 2012/01/26 18:38:30 jlec Exp $
+
+EAPI=4
+
+ AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A GTK program for drawing organic molecules"
+HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
+SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="emf gnome nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/transfig
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	emf? ( media-libs/libemf )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-no-underlinking.patch
+	)
+
+src_configure() {
+	local myeconfargs=(
+		--without-kdedir
+		$(use_with gnome gnomedir /usr)
+		$(use_enable emf)
+		--enable-undo
+		--enable-menu
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	insinto /usr/share/${PN}/examples
+	doins "${S}"/examples/*
+	if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi
+
+	insinto /usr/share/pixmaps
+	doins chemtool.xpm
+	make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
+}
diff --git a/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch b/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch
new file mode 100644
index 000000000000..5d2fe36d6bf1
--- /dev/null
+++ b/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch
@@ -0,0 +1,78 @@
+ Makefile.am  |    6 ++++--
+ configure.ac |   24 ++++--------------------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 99dbf8c..931ba16 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,10 +22,12 @@ localedir = $(datadir)/locale
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ 
+ # Make sure the gettext.h include file is found.
+-AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
++AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@ @EMFINCL@
+ 
+ # Link time dependencies.
+-LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ 
++LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -lX11
++
++AM_CFLAGS = -DGTK2
+ 
+ # Additional files to be distributed.
+ EXTRA_DIST = autogen.sh autoclean.sh
+diff --git a/configure.ac b/configure.ac
+index 6d8c45a..c5fab42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,32 +32,14 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 
+ AC_MSG_CHECKING([for GTK version and compile options ])
+ 
+-if test x$PKG_CONFIG = xno -o x$enable_gtk1 = xyes ; then
+-AM_PATH_GTK(1.0.2, , exit 1)
+-else
+-if $PKG_CONFIG gtk+-2.0 --cflags ; then
+-       GTK_CFLAGS="-DGTK2 `$PKG_CONFIG gtk+-2.0 --cflags` "
+-       GTK_LIBS=`$PKG_CONFIG gtk+-2.0 --libs`
+-dnl    use_gtk2=yes
+-       AC_DEFINE([GTK2], [1], [the GTK2 library])
+-       enable_stockgtk=yes
+-else
+-if $PKG_CONFIG --cflags gtk+ ; then
+-	GTK_CFLAGS=`$PKG_CONFIG gtk+ --cflags`       
+-	GTK_LIBS=`$PKG_CONFIG gtk+ --libs`
+-dnl    use_gtk2=no
+-fi
+-fi
+-fi
+-
+-dnl AC_MSG_RESULT using GTK2 : $use_gtk2
++PKG_CHECK_MODULES([GTK],[gtk+-2.0])
+ 
+ dnl Checks for header files.
+ AC_PATH_XTRA
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ 
+-LDFLAGS="$X_LIBS"
++LDFLAGS+="$X_LIBS"
+ AC_CHECK_LIB([X11],[XOpenDisplay])
+ dnl just an ugly hack to work around the more aggressive header checks
+ dnl in recent autoconf. Not sure if we should really rely on include
+@@ -184,6 +166,7 @@ if test x$enable_emf = xyes; then
+ 	AC_MSG_RESULT(yes)
+ 	AC_DEFINE([EMF], [1], [use optional libEMF instead of fig2dev for EMF output])
+ 	EMFLIBS="-lEMF -lstdc++"
++	EMFINCL="-I${includedir}libEMF"
+ else
+ 	AC_MSG_RESULT(no)
+ 	EMFLIBS=""
+@@ -221,6 +204,7 @@ AC_SUBST(localedir)
+ AC_SUBST(kdemimedir)
+ AC_SUBST(gnomemimedir)
+ AC_SUBST(EMFLIBS)
++AC_SUBST(EMFINCL)
+ AC_SUBST(MYGTKSRCS)
+ AC_SUBST(MYGTKOBJS)
+ AC_SUBST(GTK_CFLAGS)
diff --git a/sci-chemistry/chemtool/metadata.xml b/sci-chemistry/chemtool/metadata.xml
index 446f133a9389..f029f0c0a504 100644
--- a/sci-chemistry/chemtool/metadata.xml
+++ b/sci-chemistry/chemtool/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-	<use><flag name='emf'>EMF export support</flag></use>
+	<herd>sci-chemistry</herd>
+	<use>
+		<flag name="emf">EMF export support</flag>
+	</use>
 </pkgmetadata>