Version bump, cleanup

18 files changed, 51 insertions, 244 deletions

diff --git a/app-sci/xdrawchem/ChangeLog b/app-sci/xdrawchem/ChangeLog
index d4e795ffa9b2..a5f8f0c05db1 100644
--- a/app-sci/xdrawchem/ChangeLog
+++ b/app-sci/xdrawchem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-sci/xdrawchem
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/xdrawchem/ChangeLog,v 1.20 2004/01/04 02:10:02 caleb Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xdrawchem/ChangeLog,v 1.21 2004/02/24 08:45:11 phosphan Exp $
+
+*xdrawchem-1.7.8 (24 Feb 2004)
+
+  24 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> xdrawchem-1.4.2.ebuild,
+  xdrawchem-1.5.ebuild, xdrawchem-1.6.3.ebuild, xdrawchem-1.6.8.ebuild,
+  xdrawchem-1.6.ebuild, xdrawchem-1.7.1.ebuild, xdrawchem-1.7.3.ebuild,
+  xdrawchem-1.7.8.ebuild:
+  Version bump + cleanup
 
   03 Jan 2004; Caleb Tennis <caleb@gentoo.org> xdrawchem-1.7.5.ebuild:
   Remove the need-qt, add qt as a dependency in the ebuild
diff --git a/app-sci/xdrawchem/Manifest b/app-sci/xdrawchem/Manifest
index c6e812e927bf..156b1b71a72e 100644
--- a/app-sci/xdrawchem/Manifest
+++ b/app-sci/xdrawchem/Manifest
@@ -1,18 +1,6 @@
-MD5 4aa31055d57d578e4e20792c7f383161 ChangeLog 3592
-MD5 e6ed7e035f1b8c2a8ce58a08758d2043 xdrawchem-1.4.2.ebuild 736
-MD5 2b976e14cad20046817998bbf69c4aca xdrawchem-1.5.ebuild 868
-MD5 e10f755629d24c644e61f4c5eb49dce0 xdrawchem-1.6.ebuild 936
-MD5 39a7da2d16b3a653589e776f4a9c2453 xdrawchem-1.6.3.ebuild 791
-MD5 6b846879e95a46a547f43dda4e91f0a0 xdrawchem-1.6.8.ebuild 805
-MD5 efb9edd14ac316bbad7e5743fa19dcaa xdrawchem-1.7.1.ebuild 807
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 65885cd26da474d1c0657298163f0131 xdrawchem-1.7.3.ebuild 955
+MD5 42ae3a6d39d422e374788f3b63e17ce6 xdrawchem-1.7.8.ebuild 957
 MD5 864f4fd3e3b43bfbd55b95d6c9e484ec xdrawchem-1.7.5.ebuild 985
-MD5 be966660b5f1b49950218adfad81e553 files/digest-xdrawchem-1.4.2 64
-MD5 df59f7ab2e6c25ec9da3ab5d930c54d6 files/digest-xdrawchem-1.5 62
-MD5 c16e9a07f4d1bc1da033cbdbb3c1c2de files/digest-xdrawchem-1.6 62
-MD5 dae97bbc0999dda67f29205ea137333d files/digest-xdrawchem-1.6.3 64
-MD5 f9caf47a4f5c8f0b3615b2e4659475ab files/digest-xdrawchem-1.6.8 65
-MD5 1e913c36c691e0697764f678a1097c87 files/digest-xdrawchem-1.7.1 65
-MD5 d22a769435a66e06d073f211480b4945 files/digest-xdrawchem-1.7.3 65
+MD5 65f1e23fef0cb0b025e6d481e03d681f ChangeLog 3897
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 113f9bf75427828aeab1ff0877a6920b files/digest-xdrawchem-1.7.5 65
+MD5 c1a95992761f80fca89f9e195e07af6c files/digest-xdrawchem-1.7.8 64
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.4.2 b/app-sci/xdrawchem/files/digest-xdrawchem-1.4.2
deleted file mode 100644
index ceb05600b871..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5678b05be5b2a65cbf4ceb8b0af7f46 xdrawchem-1.4.2.tgz 394873
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.5 b/app-sci/xdrawchem/files/digest-xdrawchem-1.5
deleted file mode 100644
index 65d31565effe..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f99d0cdd43a7dd3f23a2e5459be3feb6 xdrawchem-1.5.tgz 401843
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.6 b/app-sci/xdrawchem/files/digest-xdrawchem-1.6
deleted file mode 100644
index faf6a57ecf9d..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 590c4d344322e6433701d8c402154946 xdrawchem-1.6.tgz 962907
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.6.3 b/app-sci/xdrawchem/files/digest-xdrawchem-1.6.3
deleted file mode 100644
index 729e59fcc596..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 983f7f7c60a4b156673400b1877f25ce xdrawchem-1.6.3.tgz 965170
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.6.8 b/app-sci/xdrawchem/files/digest-xdrawchem-1.6.8
deleted file mode 100644
index f39caf20c832..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 016db5791a7d1b41dcb40f3c521ab73e xdrawchem-1.6.8.tgz 1090742
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.7.1 b/app-sci/xdrawchem/files/digest-xdrawchem-1.7.1
deleted file mode 100644
index 402e2fa6158e..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1afcd8011a27cae62315b4263515e2fc xdrawchem-1.7.1.tgz 1227616
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.7.3 b/app-sci/xdrawchem/files/digest-xdrawchem-1.7.3
deleted file mode 100644
index e0fabc0b2151..000000000000
--- a/app-sci/xdrawchem/files/digest-xdrawchem-1.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44e2df8ef455b520e31eafcb9a038984 xdrawchem-1.7.3.tgz 1242152
diff --git a/app-sci/xdrawchem/files/digest-xdrawchem-1.7.8 b/app-sci/xdrawchem/files/digest-xdrawchem-1.7.8
new file mode 100644
index 000000000000..77b3b53c32db
--- /dev/null
+++ b/app-sci/xdrawchem/files/digest-xdrawchem-1.7.8
@@ -0,0 +1 @@
+MD5 cc3cd5a252924ec187197d4f2ebf7197 xdrawchem-1.7.8.tgz 970908
diff --git a/app-sci/xdrawchem/xdrawchem-1.4.2.ebuild b/app-sci/xdrawchem/xdrawchem-1.4.2.ebuild
deleted file mode 100644
index 63c1e4c92e2e..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +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/xdrawchem/xdrawchem-1.4.2.ebuild,v 1.7 2003/08/05 18:41:03 vapier Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/xdrawchem/"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/xdrawchem/xdrawchem-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.0.0 )"
-
-src_compile() {
-	emake INSTRING=/usr/share/${P} || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem
-
-	dodir /usr/share/${P}
-	insinto /usr/share/${P}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.5.ebuild b/app-sci/xdrawchem/xdrawchem-1.5.ebuild
deleted file mode 100644
index d4a62ddafb45..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.5.ebuild
+++ /dev/null
@@ -1,32 +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/xdrawchem/xdrawchem-1.5.ebuild,v 1.6 2003/08/05 18:41:03 vapier Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.0.0 )"
-#the app requires babel at run time to be able to perform various file type conversions
-RDEPEND="${DEPEND}
-	app-sci/babel"
-
-src_compile() {
-	emake -f Makefile.orig INSTRING=/usr/share/${P} || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.6.3.ebuild b/app-sci/xdrawchem/xdrawchem-1.6.3.ebuild
deleted file mode 100644
index 23e5ac9d1a81..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.6.3.ebuild
+++ /dev/null
@@ -1,30 +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/xdrawchem/xdrawchem-1.6.3.ebuild,v 1.4 2003/08/05 18:41:03 vapier Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.1.0 )"
-
-src_compile() {
-	./configure --prefix=/usr || die
-	emake -f Makefile INSTRING=/usr/share/xdrawchem || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem/xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.6.8.ebuild b/app-sci/xdrawchem/xdrawchem-1.6.8.ebuild
deleted file mode 100644
index 265d486a0158..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.6.8.ebuild
+++ /dev/null
@@ -1,31 +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/xdrawchem/xdrawchem-1.6.8.ebuild,v 1.3 2003/08/05 18:41:03 vapier Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.1.0 )"
-
-src_compile() {
-	./configure --prefix=/usr || die
-	emake -f Makefile INSTRING=/usr/share/xdrawchem || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem/xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-	dohtml doc/*
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.6.ebuild b/app-sci/xdrawchem/xdrawchem-1.6.ebuild
deleted file mode 100644
index 17985c5a28ad..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.6.ebuild
+++ /dev/null
@@ -1,33 +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/xdrawchem/xdrawchem-1.6.ebuild,v 1.6 2003/08/05 18:41:03 vapier Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.0.0 )"
-#if you would like to use app-sci/babel instead of included openbabel, please uncomment the following 2 lines
-#RDEPEND="${DEPEND}
-#	app-sci/babel"
-
-src_compile() {
-	./configure --prefix=/usr || die
-	emake -f Makefile INSTRING=/usr/share/xdrawchem || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem/xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.7.1.ebuild b/app-sci/xdrawchem/xdrawchem-1.7.1.ebuild
deleted file mode 100644
index 756b3e3f06ae..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.7.1.ebuild
+++ /dev/null
@@ -1,31 +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/xdrawchem/xdrawchem-1.7.1.ebuild,v 1.4 2004/02/22 19:53:44 agriffis Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.1.0 )"
-
-src_compile() {
-	./configure --prefix=/usr || die
-	emake -f Makefile INSTRING=/usr/share/xdrawchem || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem/xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-	dohtml doc/*
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.7.3.ebuild b/app-sci/xdrawchem/xdrawchem-1.7.3.ebuild
deleted file mode 100644
index 332884340814..000000000000
--- a/app-sci/xdrawchem/xdrawchem-1.7.3.ebuild
+++ /dev/null
@@ -1,33 +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/xdrawchem/xdrawchem-1.7.3.ebuild,v 1.3 2003/10/08 05:51:06 phosphan Exp $
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://www.prism.gatech.edu/~gte067k/${PN}"
-SRC_URI="http://www.prism.gatech.edu/~gte067k/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="qt"
-
-DEPEND="qt? ( >=x11-libs/qt-3.1.0 )"
-
-src_compile() {
-	./configure --prefix=/usr || die
-	# make sure we use moc from Qt, not from eg media-sound/moc
-	sed -i /^MOC/s/moc/$(echo ${QTDIR}|sed 's/\//\\\//g')\\/bin\\/moc/ xdrawchem/Makefile
-	emake -f Makefile INSTRING=/usr/share/xdrawchem || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin xdrawchem/xdrawchem
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ring/*
-
-	dodoc README.txt TODO.txt COPYRIGHT.txt HISTORY.txt
-	dohtml doc/*
-}
diff --git a/app-sci/xdrawchem/xdrawchem-1.7.8.ebuild b/app-sci/xdrawchem/xdrawchem-1.7.8.ebuild
new file mode 100644
index 000000000000..42df8ebe4ad3
--- /dev/null
+++ b/app-sci/xdrawchem/xdrawchem-1.7.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xdrawchem/xdrawchem-1.7.8.ebuild,v 1.1 2004/02/24 08:45:12 phosphan Exp $
+
+inherit flag-o-matic
+
+# There seems to be an issue with gcc 3.3.1, for the moment use -O0 only
+filter-flags -O1 -O2 -O3 -Os
+CXXFLAGS="-O0 ${CXXFLAGS}"
+
+DESCRIPTION="a molecular structure drawing program"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+
+DEPEND=">=x11-libs/qt-3.1.0
+	>=app-sci/openbabel-1.100.2*"
+
+src_compile() {
+	# make sure we use moc from Qt, not from eg media-sound/moc
+	PATH="${QTDIR}/bin:${PATH}"
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	cd ${D}/usr/share
+	dodir /usr/share/doc
+	mv xdrawchem/doc doc/xdrawchem
+	dosym /usr/share/doc/xdrawchem /usr/share/xdrawchem/doc
+}