From 871f04a80804d90e0de7ffe7d67792b6422b46de Mon Sep 17 00:00:00 2001 From: Patrick Kursawe Date: Mon, 8 Nov 2004 16:28:29 +0000 Subject: [PATCH] Cleanup + fixing bug #70454 --- app-sci/chemtool/ChangeLog | 6 +- app-sci/chemtool/Manifest | 7 +- app-sci/chemtool/chemtool-1.6-r1.ebuild | 75 ------------------- app-sci/chemtool/chemtool-1.6.3.ebuild | 14 ++-- app-sci/chemtool/files/chemtool-1.6.patch | 11 --- app-sci/chemtool/files/digest-chemtool-1.6-r1 | 1 - 6 files changed, 15 insertions(+), 99 deletions(-) delete mode 100644 app-sci/chemtool/chemtool-1.6-r1.ebuild delete mode 100644 app-sci/chemtool/files/chemtool-1.6.patch delete mode 100644 app-sci/chemtool/files/digest-chemtool-1.6-r1 diff --git a/app-sci/chemtool/ChangeLog b/app-sci/chemtool/ChangeLog index 3b9b77dd8b4d..0ac19b5c1765 100644 --- a/app-sci/chemtool/ChangeLog +++ b/app-sci/chemtool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-sci/chemtool # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.14 2004/08/18 07:44:26 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.15 2004/11/08 16:28:29 phosphan Exp $ + + 08 Nov 2004; Patrick Kursawe + -files/chemtool-1.6.patch, -chemtool-1.6-r1.ebuild, chemtool-1.6.3.ebuild: + Cleanup + fixing bug #70454 18 Aug 2004; Patrick Kursawe chemtool-1.6.3.ebuild: stable for x86 diff --git a/app-sci/chemtool/Manifest b/app-sci/chemtool/Manifest index b3ee87fafc3d..1c3cc4aa2be0 100644 --- a/app-sci/chemtool/Manifest +++ b/app-sci/chemtool/Manifest @@ -1,7 +1,4 @@ -MD5 2d2516fb3b3556229a8b68db9707d57a chemtool-1.6.3.ebuild 2001 -MD5 d352de50b9d491ab3ea0ad8e915e75a1 ChangeLog 2333 +MD5 52b92aababa64b29425a0d5d95aa1fb8 chemtool-1.6.3.ebuild 1953 +MD5 ddc8ec841548d8137c1af37072e1029e ChangeLog 2494 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 -MD5 ba845710f816a8c53d2afdd9abc69266 chemtool-1.6-r1.ebuild 1845 -MD5 7151e5d79c40abc9dadc9d84eee1f309 files/chemtool-1.6.patch 447 MD5 4ae73ea952733fc1500a98a82b1b8f3d files/digest-chemtool-1.6.3 66 -MD5 56154dbfda6dca74e622eafa3eb88d36 files/digest-chemtool-1.6-r1 64 diff --git a/app-sci/chemtool/chemtool-1.6-r1.ebuild b/app-sci/chemtool/chemtool-1.6-r1.ebuild deleted file mode 100644 index 3178956a6575..000000000000 --- a/app-sci/chemtool/chemtool-1.6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6-r1.ebuild,v 1.4 2004/06/24 21:55:01 agriffis Exp $ - -use kde && inherit kde-functions -inherit eutils - -DESCRIPTION="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="x86" -IUSE="gnome kde nls" - -DEPEND=">=media-gfx/transfig-3.2.3d - =x11-libs/gtk+-1* - >=media-libs/libemf-1.0" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}.patch -} - -src_compile() { - local mykdedir="${KDEDIR}" - if [ -z "${mykdedir}" ]; then mykdedir="bogus_kde"; fi - local config_opts - config_opts="--enable-emf" - - if use kde; then - config_opts="${config_opts} --with-kdedir=${mykdedir}" ; - else - config_opts="${config_opts} --without-kdedir" - fi - - if use gnome ; then - config_opts="${config_opts} --with-gnomedir=/usr" ; - else - config_opts="${config_opts} --without-gnomedir" ; - fi - - econf ${config_opts} \ - || die "./configure failed" - emake || die "make failed" -} - -src_install() { - - local mykdedir="${KDEDIR}" - if [ -z "${mykdedir}" ]; then mykdedir="bogus_kde"; fi - local sharedirs="applnk/Graphics mimelnk/application icons/hicolor/32x32/mimetypes" - for dir in ${sharedirs}; do - dodir ${mykdedir}/share/${dir} - done - dodir /usr/share/mime-types - dodir /usr/share/pixmaps/mc - - make DESTDIR="${D}" install || die "make install failed" - - if ! use kde; then - rm -rf ${D}/${mykdedir} - fi - - if ! use gnome; then - rm -rf ${D}/usr/share/pixmaps ${D}/usr/share/mime-types - fi - - dodoc ChangeLog INSTALL README TODO - insinto /usr/share/${PN}/examples - doins ${S}/examples/* - if ! use nls; then rm -rf ${D}/usr/share/locale; fi -} diff --git a/app-sci/chemtool/chemtool-1.6.3.ebuild b/app-sci/chemtool/chemtool-1.6.3.ebuild index fde13f70031b..929d48e0ac16 100644 --- a/app-sci/chemtool/chemtool-1.6.3.ebuild +++ b/app-sci/chemtool/chemtool-1.6.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6.3.ebuild,v 1.4 2004/08/18 07:44:26 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6.3.ebuild,v 1.5 2004/11/08 16:28:29 phosphan Exp $ -use kde && inherit kde-functions +inherit kde-functions inherit eutils DESCRIPTION="program for drawing organic molecules" @@ -19,10 +19,14 @@ DEPEND=">=media-gfx/transfig-3.2.3d x86? ( >=media-libs/libemf-1.0 )" src_compile() { - local mykdedir="${KDEDIR}" - if [ -z "${mykdedir}" ]; then mykdedir="bogus_kde"; fi local config_opts local mycppflags + local mykdedir + if [ -z "${KDEDIR}" ]; then + mykdedir="bogus_kde" + else + mykdedir="${KDEDIR}" + fi if [ ${ARCH} = "x86" ]; then config_opts="--enable-emf" mycppflags="${mycppflags} -I /usr/include/libEMF" @@ -33,8 +37,6 @@ src_compile() { if use kde; then config_opts="${config_opts} --with-kdedir=${mykdedir}" ; - else - config_opts="${config_opts} --without-kdedir" fi if use gnome ; then diff --git a/app-sci/chemtool/files/chemtool-1.6.patch b/app-sci/chemtool/files/chemtool-1.6.patch deleted file mode 100644 index 89252ea9b8ce..000000000000 --- a/app-sci/chemtool/files/chemtool-1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in 2003-05-11 15:02:15.000000000 +0200 -+++ Makefile.in.new 2003-07-17 13:56:25.000000000 +0200 -@@ -5,7 +5,7 @@ - mandir=@mandir@ - kdedir=@kdemimedir@ - gnomedir=@gnomemimedir@ --CFLAGS=-O2 -Wall -Wunused -Wuninitialized -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\" -+CFLAGS=-O2 -Wall -Wunused -Wuninitialized -I /usr/include/libEMF -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\" - - CC=@CC@ - CP=/bin/cp diff --git a/app-sci/chemtool/files/digest-chemtool-1.6-r1 b/app-sci/chemtool/files/digest-chemtool-1.6-r1 deleted file mode 100644 index fcc0538bc658..000000000000 --- a/app-sci/chemtool/files/digest-chemtool-1.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1b7a1bde89517ef8a1b4a566bfbd9b3f chemtool-1.6.tar.gz 358695 -- 2.26.2