Fix old ebuild that was dependant on kde 2.2

8 files changed, 9 insertions, 271 deletions

diff --git a/app-sci/chemtool/ChangeLog b/app-sci/chemtool/ChangeLog
index 3ffb792085a5..95536e6c2140 100644
--- a/app-sci/chemtool/ChangeLog
+++ b/app-sci/chemtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/chemtool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.9 2004/03/15 13:34:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.10 2004/04/16 00:50:23 caleb Exp $
+
+  15 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/Makefile.in-chemtool-1.5-gentoo.diff,
+  -files/config.h.in-chemtool-1.5-gentoo.diff,
+  -files/configure.in-chemtool-1.5-gentoo.diff,
+  -files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff, -chemtool-1.6.ebuild:
+  Remove old ebuild that was dependent on kde 2.2 anyway.
 
   15 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> chemtool-1.6-r1.ebuild:
   Removing historical supersed dependency and need-kde 2
diff --git a/app-sci/chemtool/Manifest b/app-sci/chemtool/Manifest
index 7e4ff8a128c3..1b6a8e3fff67 100644
--- a/app-sci/chemtool/Manifest
+++ b/app-sci/chemtool/Manifest
@@ -1,11 +1,5 @@
-MD5 bca4cc8c9b56637e5edc3b054da2e33a chemtool-1.6.ebuild 2085
-MD5 e85bd2b11e96dba142a9598770f93bc5 ChangeLog 1624
+MD5 7abce5aff54fa78f2b7d434de55365c8 ChangeLog 1947
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 a1f2c92ac167617b464b1c0c0965c0ff chemtool-1.6-r1.ebuild 1881
-MD5 55ed6136e52ec1136e015844186dd7ba files/config.h.in-chemtool-1.5-gentoo.diff 368
-MD5 56154dbfda6dca74e622eafa3eb88d36 files/digest-chemtool-1.6 64
 MD5 7151e5d79c40abc9dadc9d84eee1f309 files/chemtool-1.6.patch 447
-MD5 85997784eda14376edb5a380af598393 files/Makefile.in-chemtool-1.5-gentoo.diff 2715
-MD5 a3c19580612c87d845915088e7b2b17b files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff 294
-MD5 55ee243e7331b078a204b1ad52ef4146 files/configure.in-chemtool-1.5-gentoo.diff 2069
 MD5 56154dbfda6dca74e622eafa3eb88d36 files/digest-chemtool-1.6-r1 64
diff --git a/app-sci/chemtool/chemtool-1.6.ebuild b/app-sci/chemtool/chemtool-1.6.ebuild
deleted file mode 100644
index b55dbd281a9c..000000000000
--- a/app-sci/chemtool/chemtool-1.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6.ebuild,v 1.6 2003/12/02 10:27:16 phosphan Exp $
-
-[ -n "`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
-	sys-apps/supersed
-	nls? ( sys-devel/gettext )"
-
-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
-		need-kde 2
-		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
-
-	if [ "`use nls`" ] ; then
-		config_opts="${config_opts} --enable-locales \
-			--with-localedir=/usr/share/locale"
-	else
-		config_opts="${config_opts} --disable-locales \
-			--without-localedir"
-	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/*
-}
diff --git a/app-sci/chemtool/files/Makefile.in-chemtool-1.5-gentoo.diff b/app-sci/chemtool/files/Makefile.in-chemtool-1.5-gentoo.diff
deleted file mode 100644
index 9e3197a610a5..000000000000
--- a/app-sci/chemtool/files/Makefile.in-chemtool-1.5-gentoo.diff
+++ /dev/null
@@ -1,75 +0,0 @@
---- chemtool-1.5/Makefile.in	2002-04-11 14:41:37.000000000 -0500
-+++ chemtool-1.5-gentoo/Makefile.in	2002-11-13 01:35:30.000000000 -0500
-@@ -2,10 +2,13 @@
- exec_prefix=@exec_prefix@
- datadir=@datadir@
- localedir=@localedir@
-+uselocales=@uselocales@
- mandir=@mandir@
- kdedir=@kdemimedir@
-+usekde=@usekde@
- gnomedir=@gnomemimedir@
--CFLAGS=-O2 -Wall -Wunused -Wuninitialized -I. `gtk-config --cflags` @DEFS@ -DLOCALEDIR=\"${localedir}\"
-+usegnome=@usegnome@
-+CFLAGS=@CFLAGS@ -I. `gtk-config --cflags` @DEFS@
- 
- CC=@CC@
- CP=/bin/cp
-@@ -26,7 +29,7 @@
- 	${CC} ${OBJS} ${SYS_LIBRARIES} -o chemtool
- 
- cht:	src-cht/cht-2.1.c
--	cd src-cht;${MAKE}
-+	cd src-cht && ${MAKE}
- 
- 
- install: chemtool src-cht/cht
-@@ -34,21 +37,37 @@
- 	${INSTALL} chemtool src-cht/cht ${prefix}/bin
- 	$(INSTALL) chemtool.1 ${mandir}/man1
- 	$(INSTALL) cht.1 ${mandir}/man1
--ifdef localedir
--	for L in `ls locales`; do ${INSTALL} -d ${localedir}/$$L/LC_MESSAGES; ${INSTALL} -m664 locales/$$L/chemtool.mo ${localedir}/$$L/LC_MESSAGES;done
-+ifdef uselocales
-+	for L in `ls locales` ; do \
-+		${INSTALL} -d ${localedir}/$$L/LC_MESSAGES ; \
-+		${INSTALL} -m664 locales/$$L/chemtool.mo \
-+			${localedir}/$$L/LC_MESSAGES ; \
-+	done
- endif
--ifdef kdedir
--	${INSTALL} kde/applnk/Graphics/chemtool.desktop ${kdedir}/share/applnk/Graphics 
--	${INSTALL} kde/mimelnk/application/x-chemtool.desktop ${kdedir}/share/mimelnk/application
--	${INSTALL} kde/icons/hicolor/32x32/mimetypes/chemtool.png ${kdedir}/share/icons/hicolor/32x32/mimetypes
-+ifdef usekde
-+	${INSTALL} -d ${kdedir}/share/applnk/Graphics \
-+		${kdedir}/share/mimelnk/application \
-+		${kdedir}/share/icons/hicolor/32x32/mimetypes
-+	${INSTALL} kde/applnk/Graphics/chemtool.desktop \
-+		${kdedir}/share/applnk/Graphics
-+	${INSTALL} kde/mimelnk/application/x-chemtool.desktop \
-+		${kdedir}/share/mimelnk/application
-+	${INSTALL} kde/icons/hicolor/32x32/mimetypes/chemtool.png \
-+		${kdedir}/share/icons/hicolor/32x32/mimetypes
-+endif
-+ifdef usegnome
-+	${INSTALL} -d ${gnomedir}/share/mime-types \
-+		${gnomedir}/share/pixmaps/mc
-+	${INSTALL} gnome/mime-types/chemtool.keys \
-+		gnome/mime-types/chemtool.mime \
-+		${gnomedir}/share/mime-types
-+	${INSTALL} gnome/gnome-application-chemtool.png \
-+		${gnomedir}/share/pixmaps/mc
- endif
- 
--ifdef gnomedir
--	${INSTALL} gnome/mime-types/chemtool.keys gnome/mime-types/chemtool.mime ${gnomedir}/share/mime-types
--	${INSTALL} gnome/gnome-application-chemtool.png ${gnomedir}/share/pixmaps/mc
--endif 
- clean:
- 	-${RM} *.o *~ src-cht/*.o src-cht/*~ chemtool src-cht/cht
- 
- distclean: clean
--	-${RM} Makefile src-cht/Makefile config.log config.cache config.status config.h
-+	-${RM} Makefile src-cht/Makefile config.log config.cache \
-+		config.status config.h
diff --git a/app-sci/chemtool/files/config.h.in-chemtool-1.5-gentoo.diff b/app-sci/chemtool/files/config.h.in-chemtool-1.5-gentoo.diff
deleted file mode 100644
index b56681f37984..000000000000
--- a/app-sci/chemtool/files/config.h.in-chemtool-1.5-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- chemtool-1.5/config.h.in	2002-03-09 11:27:32.000000000 -0500
-+++ chemtool-1.5-gentoo/config.h.in	2002-11-12 18:21:10.000000000 -0500
-@@ -18,6 +18,9 @@
- /* Define if your <sys/time.h> declares struct tm.  */
- #undef TM_IN_SYS_TIME
- 
-+/* Define to the localisation path */
-+#undef LOCALEDIR
-+
- /* Define if you want to disable localisation */
- #undef DISABLE_NLS 
- 
diff --git a/app-sci/chemtool/files/configure.in-chemtool-1.5-gentoo.diff b/app-sci/chemtool/files/configure.in-chemtool-1.5-gentoo.diff
deleted file mode 100644
index 4f582d4ace47..000000000000
--- a/app-sci/chemtool/files/configure.in-chemtool-1.5-gentoo.diff
+++ /dev/null
@@ -1,79 +0,0 @@
---- chemtool-1.5/configure.in	2002-04-11 14:40:46.000000000 -0500
-+++ chemtool-1.5-gentoo/configure.in	2002-11-12 18:39:20.000000000 -0500
-@@ -47,6 +47,7 @@
- kdedir=$withval,
- [kdedir=/opt/kde])
- AC_MSG_CHECKING([for KDE ])
-+if test "x$kdedir" != "xno" ; then
- if test -d $kdedir/share/mimelnk ; then
- 	kdemimedir=$kdedir
- 	AC_MSG_RESULT([apparently in $kdemimedir])
-@@ -57,8 +58,11 @@
- 	kdemimedir=$KDEMIMEDIR
- 	fi
- fi
-+fi
- if test "x$kdemimedir" = "x" ; then
- 	AC_MSG_RESULT([no])
-+else
-+    usekde="yes"
- fi
- dnl AC_DEFINE_UNQUOTED(KDEDIR=$withval),
- dnl [AC_DEFINE_UNQUOTED(KDEDIR="\"\/opt/kde"\")])
-@@ -70,6 +74,7 @@
- gnomedir=$withval,
- [gnomedir=/usr])
- AC_MSG_CHECKING([for GNOME ])
-+if test "x$gnomedir" != "xno" ; then
- if test -d $gnomedir/share/mime-info ; then
- 	gnomemimedir=$gnomedir
- 	AC_MSG_RESULT([apparently in $gnomemimedir])
-@@ -80,24 +85,28 @@
- 	gnomemimedir=$GNOMEMIMEDIR
- 	fi
- fi
--if test "x$GNOMEMIMEDIR" = "x" ; then
-+fi
-+if test "x$gnomemimedir" = "x" ; then
- 	AC_MSG_RESULT([no])
-+else
-+    usegnome="yes"
- fi
- dnl AC_DEFINE_UNQUOTED(GNOMEMIMEDIR=$withval),
- dnl [AC_DEFINE_UNQUOTED(GNOMEMIMEDIR="\"\/usr"\")])
- dnl "
- 
- AC_MSG_CHECKING(whether to enable locales)
--dnl AC_ARG_ENABLE(locales,
--dnl [  --enable-locales        Use locales [no]],,enable_locales=no)
--dnl if test x$enable_locales = xyes; then
--if test "$ac_cv_header_libintl_h" = "yes" 
-+AC_ARG_ENABLE(locales,
-+[  --enable-locales        Use locales [no]],,enable_locales=no)
-+if test x$enable_locales = "xyes" ;
-+dnl if test "$ac_cv_header_libintl_h" = "yes" 
- then
--	AC_MSG_RESULT(yes)
--        AC_DEFINE_UNQUOTED(LOCALEDIR="\"\$datadir/locale"\")
--else	
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE_UNQUOTED(LOCALEDIR, "$datadir/locale")
-+    uselocales="yes"
-+else
- 	AC_MSG_RESULT(no)
--	AC_DEFINE(DISABLE_NLS)
-+	AC_DEFINE(DISABLE_NLS) 
- fi
- 
- AC_MSG_CHECKING(whether to enable libundo)
-@@ -121,7 +130,10 @@
- fi
- 
- AC_SUBST(localedir)
-+AC_SUBST(uselocales)
- AC_SUBST(kdemimedir)
-+AC_SUBST(usekde)
- AC_SUBST(gnomemimedir)
-+AC_SUBST(usegnome)
- 
- AC_OUTPUT(Makefile src-cht/Makefile)
diff --git a/app-sci/chemtool/files/digest-chemtool-1.6 b/app-sci/chemtool/files/digest-chemtool-1.6
deleted file mode 100644
index fcc0538bc658..000000000000
--- a/app-sci/chemtool/files/digest-chemtool-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b7a1bde89517ef8a1b4a566bfbd9b3f chemtool-1.6.tar.gz 358695
diff --git a/app-sci/chemtool/files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff b/app-sci/chemtool/files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff
deleted file mode 100644
index 88db3d914e67..000000000000
--- a/app-sci/chemtool/files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- chemtool-1.5/src-cht/Makefile.in	2002-03-09 11:27:32.000000000 -0500
-+++ chemtool-1.5-gentoo/src-cht/Makefile.in	2002-11-12 17:07:07.000000000 -0500
-@@ -1,4 +1,7 @@
-+CC = @CC@
-+CFLAGS = @CFLAGS@
-+
- default: cht
- 
- cht:	cht-2.1.c
--	gcc -O cht-2.1.c -o cht
-+	$(CC) $(CFLAGS) -o cht cht-2.1.c