summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-01-26 18:38:30 +0000
committerJustin Lecher <jlec@gentoo.org>2012-01-26 18:38:30 +0000
commit4d393c7caaeb99758062b165dbb2947824df7e4e (patch)
treec0d0f652e9b6b65e7810ea569bca93562d7c71a7 /sci-chemistry/chemtool
parentversion bump (diff)
downloadhistorical-4d393c7caaeb99758062b165dbb2947824df7e4e.tar.gz
historical-4d393c7caaeb99758062b165dbb2947824df7e4e.tar.bz2
historical-4d393c7caaeb99758062b165dbb2947824df7e4e.zip
Version Bump, #400733; add missing deps
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/chemtool')
-rw-r--r--sci-chemistry/chemtool/ChangeLog11
-rw-r--r--sci-chemistry/chemtool/Manifest21
-rw-r--r--sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild7
-rw-r--r--sci-chemistry/chemtool/chemtool-1.6.12.ebuild7
-rw-r--r--sci-chemistry/chemtool/chemtool-1.6.13.ebuild57
-rw-r--r--sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch78
-rw-r--r--sci-chemistry/chemtool/metadata.xml6
7 files changed, 170 insertions, 17 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/Manifest b/sci-chemistry/chemtool/Manifest
index 51a13902c8f2..2a1e59d1ffa6 100644
--- a/sci-chemistry/chemtool/Manifest
+++ b/sci-chemistry/chemtool/Manifest
@@ -1,16 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX 1.6.12-no-underlinking.patch 1404 RMD160 41a6889499390ea5cad8735ddf380ee319bc9694 SHA1 5bc5fa692198386d7aeb4ce6ea36fc91759bc99c SHA256 606102b97e464a3c56abf3c82e5845805cd6828e6b1528608a86b4ce34cc6d76
+AUX 1.6.13-no-underlinking.patch 2251 RMD160 2d8b66b21672852ce888add039b72b40732448ca SHA1 652d70699a427bcba0364b8cc390fce08ff55d6a SHA256 49cd82280ac80e06bb92fd521be85b1b38998e1d1831ed64d2e447315c78141e
DIST chemtool-1.6.12.tar.gz 733454 RMD160 b3501d4af20164e6ec3227970d6daf2950e5506c SHA1 23ab6555fcad2b85c3ecdde7ee4b62f1de1c7acc SHA256 24db06e47a3b2ab1c8882eb99961d788e0d7fa89d5fbd9b87a70352c88303408
-EBUILD chemtool-1.6.12-r1.ebuild 1317 RMD160 7b6f706dd48e0a28904fc40465a161c36c7cabf9 SHA1 be1f946a3e24be69322276fce8b0bc934082bac4 SHA256 8bd9094f949c9d13c74e07a2759eb713c150e70eba03e48c21b170d093ef6f1a
-EBUILD chemtool-1.6.12.ebuild 1533 RMD160 85d1300548045afb6b198488f4e8e181966ca871 SHA1 97af0d571dd65d77b8b141c528100eedb1c84600 SHA256 8ed791539a0d0d4a49621821807b101216e67a2429d0062c02f7a59b0d98a889
-MISC ChangeLog 6849 RMD160 60a8580893bb2df254494cba8005951936a2154c SHA1 75776058879b0d4473deca1ab8c2c76cdd71812a SHA256 4a76cc0312943df29915d1fea8d45df74ed42fd09aac0a89aafc8375e9b81d87
-MISC metadata.xml 221 RMD160 d066acf5ec09c6c83fb7327a077beef10dfe41b3 SHA1 fc14ac48f6abff268223e098dcf565150a34964b SHA256 17221408f93ece18cc6b11a644132595326dbe0762c27ed4028ca07449b583e6
+DIST chemtool-1.6.13.tar.gz 838868 RMD160 c54494fdda19deb0115839263c7db5b9825bf56b SHA1 03d139cfefe9e4e8957239d8d16c56dc6a369090 SHA256 31a07683f55305c3e0c4d7af3bc3d1d3a9a2eff4d836455fe1e382962f0aa0c8
+EBUILD chemtool-1.6.12-r1.ebuild 1367 RMD160 c874509fb1f8b69de8f8f22ba97b30da1446ec3c SHA1 0fb431e65b537ea7d7957c9d07235a464a26417b SHA256 b9707f41891a0d4715e82a4d8985dc8bdeba4fa05413bb92622480afbee74098
+EBUILD chemtool-1.6.12.ebuild 1583 RMD160 2a948a83f56b2f687f68954f6ade87fb5d6802f0 SHA1 9559074d3df4c3e533a76b874da3fc1e075d087b SHA256 35d4704cc66b5487f76d006543c97f066e2248af511e303ba8c04b1654bcf7b5
+EBUILD chemtool-1.6.13.ebuild 1292 RMD160 5aba4791f548930548f3350f9ea8626d0aeda026 SHA1 de42166eac978b02e1b2525ec1c80a1c28870d34 SHA256 4882f49af12d4381cf3a195624274dbf8698849081cf40d7e56d802ae16a13f2
+MISC ChangeLog 7102 RMD160 e610436ef83f2c9ce6d2f3e89fd79d77acc477a4 SHA1 cfcb3d8516ca99ea3b4ed22795572a169618c315 SHA256 7507b809d8846654b7313b72faacc2a22546a565ed466cd2e53185bc05ee13f0
+MISC metadata.xml 227 RMD160 8dd27b13d589400376507c821e716c5c0e019579 SHA1 152e24c6ac631d6fc0fb9ab267ce624b54eec820 SHA256 ffffc5b8840dc119c31fbb0519d76c2d2e58cbcad97761e10242e3f63b908cdf
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk3aes0ACgkQgAnW8HDreRZkVwCgrE3tTMKhV6U89i1/IcrpYvRA
-b7wAn3V8zXa/IfKriEkCGGMrsXXRJIsr
-=0v8G
+iEYEAREKAAYFAk8hnbEACgkQgAnW8HDreRZ6jQCgkUSssSdsCgG7TfFLRYA42Oz3
+y0AAnjkluQ3fVhdQRadmm/kC5TkdhX7u
+=Ka7t
-----END PGP SIGNATURE-----
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>