summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-03-27 07:12:19 +0000
committerJustin Lecher <jlec@gentoo.org>2014-03-27 07:12:19 +0000
commitdb26a65bf095fb495b02f6394cfc5d036f190167 (patch)
treeadfdf4ad713cb6c113606cfe2cd3e76316e13c6b /sci-chemistry/chemtool
parentsci-chemistry/chemtool: Drop old (diff)
downloadgentoo-2-db26a65bf095fb495b02f6394cfc5d036f190167.tar.gz
gentoo-2-db26a65bf095fb495b02f6394cfc5d036f190167.tar.bz2
gentoo-2-db26a65bf095fb495b02f6394cfc5d036f190167.zip
sci-chemistry/chemtool: Drop old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-chemistry/chemtool')
-rw-r--r--sci-chemistry/chemtool/ChangeLog7
-rw-r--r--sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild59
-rw-r--r--sci-chemistry/chemtool/chemtool-1.6.12.ebuild63
-rw-r--r--sci-chemistry/chemtool/files/1.6.12-no-underlinking.patch50
-rw-r--r--sci-chemistry/chemtool/metadata.xml8
5 files changed, 10 insertions, 177 deletions
diff --git a/sci-chemistry/chemtool/ChangeLog b/sci-chemistry/chemtool/ChangeLog
index ec6c338f64a8..da75aa0cd403 100644
--- a/sci-chemistry/chemtool/ChangeLog
+++ b/sci-chemistry/chemtool/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-chemistry/chemtool
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.38 2014/03/24 15:07:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.39 2014/03/27 07:12:18 jlec Exp $
+
+ 27 Mar 2014; Justin Lecher <jlec@gentoo.org> -chemtool-1.6.12.ebuild,
+ -chemtool-1.6.12-r1.ebuild, -files/1.6.12-no-underlinking.patch,
+ metadata.xml:
+ Drop old
24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> chemtool-1.6.13.ebuild:
Stable for ppc, wrt bug #501046
diff --git a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild
deleted file mode 100644
index 0e9a62db37c3..000000000000
--- a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3 2012/05/04 07:02:32 jdhore Exp $
-
-EAPI=4
-
-inherit autotools 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}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-no-underlinking.patch
- eautoreconf
-}
-
-src_configure() {
- local mycppflags
-
- if use emf; then
- mycppflags="${mycppflags} -I /usr/include/libEMF"
- fi
-
- sed -e "s:\(^CPPFLAGS.*\):\1 ${mycppflags}:" -i Makefile.in || \
- die "could not append cppflags"
-
- econf \
- --without-kdedir \
- $(use_with gnome gnomedir /usr) \
- $(use_enable emf) \
- --enable-menu
-}
-
-src_install() {
- default
- insinto /usr/share/${PN}/examples
- doins "${S}"/examples/*
- if ! use nls; then rm -rf "${ED}"/usr/share/locale; fi
-
- insinto /usr/share/pixmaps
- doins chemtool.xpm
- make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
-}
diff --git a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12.ebuild
deleted file mode 100644
index b0a7ee604e33..000000000000
--- a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.8 2012/05/04 07:02:32 jdhore Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="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="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}
- virtual/pkgconfig"
-
-src_compile() {
- local config_opts
- local mycppflags
-
- unset KDEDIR
- config_opts="${config_opts} --without-kdedir"
-
- if [ ${ARCH} = "x86" ]; then
- config_opts="${config_opts} --enable-emf"
- mycppflags="${mycppflags} -I /usr/include/libEMF"
- fi
-
- sed -e "s:\(^CPPFLAGS.*\):\1 ${mycppflags}:" -i Makefile.in || \
- die "could not append cppflags"
-
- if use gnome ; then
- config_opts="${config_opts} --with-gnomedir=/usr" ;
- else
- config_opts="${config_opts} --without-gnomedir" ;
- fi
-
- econf ${config_opts} --enable-menu
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc ChangeLog INSTALL README TODO
- insinto /usr/share/${PN}/examples
- doins "${S}"/examples/*
- if ! use nls; then rm -rf "${D}"/usr/share/locale; 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.12-no-underlinking.patch b/sci-chemistry/chemtool/files/1.6.12-no-underlinking.patch
deleted file mode 100644
index acb505108ed2..000000000000
--- a/sci-chemistry/chemtool/files/1.6.12-no-underlinking.patch
+++ /dev/null
@@ -1,50 +0,0 @@
- Makefile.am | 4 +++-
- configure.ac | 20 +-------------------
- 2 files changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 59f9547..dafffaf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,9 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
-
- # 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 29e3344..6fd754f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,25 +34,7 @@ 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_X
diff --git a/sci-chemistry/chemtool/metadata.xml b/sci-chemistry/chemtool/metadata.xml
index f029f0c0a504..26c258873424 100644
--- a/sci-chemistry/chemtool/metadata.xml
+++ b/sci-chemistry/chemtool/metadata.xml
@@ -1,8 +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>