Big cleanup. Version bump.

(Portage version: 2.0.51.19)

14 files changed, 21 insertions, 181 deletions

diff --git a/sci-chemistry/xdrawchem/ChangeLog b/sci-chemistry/xdrawchem/ChangeLog
index f63ef52e4897..95ac9e23d368 100644
--- a/sci-chemistry/xdrawchem/ChangeLog
+++ b/sci-chemistry/xdrawchem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/xdrawchem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/ChangeLog,v 1.8 2005/05/05 22:42:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/ChangeLog,v 1.9 2005/05/06 07:25:49 phosphan Exp $
+
+*xdrawchem-1.9.5 (06 May 2005)
+
+  06 May 2005; Patrick Kursawe <phosphan@gentoo.org> -xdrawchem-1.7.8.ebuild,
+  -xdrawchem-1.8.4.ebuild, -xdrawchem-1.8.5.ebuild, -xdrawchem-1.9.2.ebuild,
+  -xdrawchem-1.9.3.ebuild, xdrawchem-1.9.4.ebuild, +xdrawchem-1.9.5.ebuild:
+  Big cleanup. Version bump.
 
   05 May 2005; Sven Wegener <swegener@gentoo.org> xdrawchem-1.7.8.ebuild,
   xdrawchem-1.8.4.ebuild, xdrawchem-1.8.5.ebuild, xdrawchem-1.9.ebuild,
diff --git a/sci-chemistry/xdrawchem/Manifest b/sci-chemistry/xdrawchem/Manifest
index 3cef771eed8e..3b8778be1209 100644
--- a/sci-chemistry/xdrawchem/Manifest
+++ b/sci-chemistry/xdrawchem/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d05d3f52c9a12808c09c1d4d82cb2688 xdrawchem-1.8.4.ebuild 928
-MD5 4b1b44369cdd1f5bbcc17743c2dd9b12 xdrawchem-1.9.2.ebuild 933
-MD5 3130c31dbbc6a0cfb929f4615d842787 xdrawchem-1.7.8.ebuild 983
-MD5 9fbad3a0a338fbc8313fb12a42a8ab40 xdrawchem-1.9.4.ebuild 912
-MD5 f275be3c737ba50e734a3a6c7a12f5c6 xdrawchem-1.8.5.ebuild 935
-MD5 ddb0aa2e50d6faf703684f3d83fd2e69 xdrawchem-1.9.3.ebuild 937
+MD5 d3b4979e87598bf91bf14da0658ccfee xdrawchem-1.9.4.ebuild 911
 MD5 39ec747c19c0c3469b9b968c976111f4 xdrawchem-1.9.ebuild 929
+MD5 9fbad3a0a338fbc8313fb12a42a8ab40 xdrawchem-1.9.5.ebuild 912
 MD5 125e46bdfb03d6ab205ec0be73f4760c ChangeLog 6744
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 c1a95992761f80fca89f9e195e07af6c files/digest-xdrawchem-1.7.8 64
-MD5 70263425e975820b388176a7be117d91 files/digest-xdrawchem-1.8.4 68
-MD5 ecf1886c22b230931211ed6f9644ba41 files/digest-xdrawchem-1.8.5 68
-MD5 31e3555e9dacc3e4655c4307acf9465b files/digest-xdrawchem-1.9.2 68
-MD5 c6b1805d6ea410c9db8e798d4ae4d535 files/digest-xdrawchem-1.9.3 68
 MD5 498da237913312065a68e2ad63daf0fb files/digest-xdrawchem-1.9.4 68
+MD5 b91307b158c81f4550e6103553f4d024 files/digest-xdrawchem-1.9.5 67
 MD5 d70f0fb04b210abb4ad736db129d1f22 files/digest-xdrawchem-1.9 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeqFAI1lqEGTUzyQRAtXrAKCeNuhtpeunrWB+y3Mt9WqRV10CPACff0JT
-+N2y9Ak3LVYYu8qWUbk7V1I=
-=+7cO
------END PGP SIGNATURE-----
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.7.8 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.7.8
deleted file mode 100644
index 77b3b53c32db..000000000000
--- a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.7.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc3cd5a252924ec187197d4f2ebf7197 xdrawchem-1.7.8.tgz 970908
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.4 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.4
deleted file mode 100644
index 7b5c2e8f5359..000000000000
--- a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7a572f1e5970952badc8c6d01296ccd xdrawchem-1.8.4.tar.gz 1043435
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.5 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.5
deleted file mode 100644
index 0264cd5dde4e..000000000000
--- a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a19d1a9813f716fe786f64e61c4a544 xdrawchem-1.8.5.tar.gz 1043888
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.2 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.2
deleted file mode 100644
index abc971327bc5..000000000000
--- a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0c230e3e2f87f0d7ac4c54b21a305ef xdrawchem-1.9.2.tar.gz 1122014
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.3 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.3
deleted file mode 100644
index f3d2ca9aa6e5..000000000000
--- a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d597d0f9ba2b9f5576f476adaf23c45b xdrawchem-1.9.3.tar.gz 1130629
diff --git a/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.5 b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.5
new file mode 100644
index 000000000000..12e530cb3568
--- /dev/null
+++ b/sci-chemistry/xdrawchem/files/digest-xdrawchem-1.9.5
@@ -0,0 +1 @@
+MD5 cb3782d6b76f96682dbcd5837b24802f xdrawchem-1.9.5.tar.gz 852256
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.7.8.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.7.8.ebuild
deleted file mode 100644
index abb39c75456c..000000000000
--- a/sci-chemistry/xdrawchem/xdrawchem-1.7.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.7.8.ebuild,v 1.3 2005/05/05 22:42:01 swegener 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://xdrawchem.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
-	dev-util/pkgconfig
-	>=sci-chemistry/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
-}
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.8.4.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.8.4.ebuild
deleted file mode 100644
index 543ba966e43c..000000000000
--- a/sci-chemistry/xdrawchem/xdrawchem-1.8.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.8.4.ebuild,v 1.3 2005/05/05 22:42:01 swegener Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://xdrawchem.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-3.1.0
-	>=sys-devel/gcc-3.2
-	dev-util/pkgconfig
-	>=sci-chemistry/openbabel-1.100.2"
-
-src_compile() {
-	append-flags -O0 # incredible compile times otherwise
-	# 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
-}
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.8.5.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.8.5.ebuild
deleted file mode 100644
index 4470f14362aa..000000000000
--- a/sci-chemistry/xdrawchem/xdrawchem-1.8.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.8.5.ebuild,v 1.3 2005/05/05 22:42:01 swegener Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://xdrawchem.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~amd64"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-3.1.0
-	>=sys-devel/gcc-3.2
-	dev-util/pkgconfig
-	>=sci-chemistry/openbabel-1.100.2"
-
-src_compile() {
-	append-flags -O0 # incredible compile times otherwise
-	# 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
-}
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.9.2.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.9.2.ebuild
deleted file mode 100644
index f2f520c76532..000000000000
--- a/sci-chemistry/xdrawchem/xdrawchem-1.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.9.2.ebuild,v 1.2 2005/05/05 22:42:01 swegener Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="a molecular structure drawing program"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-3.1.0
-	>=sys-devel/gcc-3.2
-	dev-util/pkgconfig
-	>=sci-chemistry/openbabel-1.100.2"
-
-src_compile() {
-	append-flags -O0 # incredible compile times otherwise
-	# 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
-}
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild
index 014e86f7964e..42bd0942fb48 100644
--- a/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild
+++ b/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild,v 1.2 2005/05/05 22:42:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.9.4.ebuild,v 1.3 2005/05/06 07:25:50 phosphan Exp $
 
 DESCRIPTION="Molecular structure drawing program"
 HOMEPAGE="http://xdrawchem.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 ~sparc ~amd64"
 IUSE=""
 
 DEPEND=">=x11-libs/qt-3.1.0
diff --git a/sci-chemistry/xdrawchem/xdrawchem-1.9.3.ebuild b/sci-chemistry/xdrawchem/xdrawchem-1.9.5.ebuild
index d8a92023a758..a2cb0e46809c 100644
--- a/sci-chemistry/xdrawchem/xdrawchem-1.9.3.ebuild
+++ b/sci-chemistry/xdrawchem/xdrawchem-1.9.5.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.9.3.ebuild,v 1.2 2005/05/05 22:42:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdrawchem/xdrawchem-1.9.5.ebuild,v 1.1 2005/05/06 07:25:50 phosphan Exp $
 
-inherit flag-o-matic
-
-DESCRIPTION="a molecular structure drawing program"
+DESCRIPTION="Molecular structure drawing program"
 HOMEPAGE="http://xdrawchem.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -19,17 +17,16 @@ DEPEND=">=x11-libs/qt-3.1.0
 	>=sci-chemistry/openbabel-1.100.2"
 
 src_compile() {
-	append-flags -O0 # incredible compile times otherwise
 	# make sure we use moc from Qt, not from eg media-sound/moc
 	PATH="${QTDIR}/bin:${PATH}"
-	econf || die
-	emake || die
+	econf || die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed."
 	cd ${D}/usr/share
 	dodir /usr/share/doc
-	mv xdrawchem/doc doc/xdrawchem
-	dosym /usr/share/doc/xdrawchem /usr/share/xdrawchem/doc
+	mv xdrawchem/doc doc/${PF}
+	dosym /usr/share/doc/${PF} /usr/share/xdrawchem/doc
 }