Fixed DEPEND/RDEPEND, whitespace. Add QA_TEXTRELS and QA_PRESTRIPPED. Fix symlink. Cleanup.

(Portage version: 2.2_rc33/svn/Linux x86_64)

svn path=/sunrise/; revision=8504

3 files changed, 49 insertions, 19 deletions

diff --git a/dev-util/dbdesigner/ChangeLog b/dev-util/dbdesigner/ChangeLog
index 00d3a67b2..8730b418d 100644
--- a/dev-util/dbdesigner/ChangeLog
+++ b/dev-util/dbdesigner/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 May 2009; Christian Ruppert <idl0r@gentoo.org>
+  dbdesigner-4.0.5.4-r1.ebuild:
+  Fixed DEPEND/RDEPEND, whitespace. Add QA_TEXTRELS and QA_PRESTRIPPED. Fix
+  symlink. Cleanup.
+
   05 May 2009; Markos Chandras <hwoarang@gentoo.org>
   -dbdesigner-4.0.5.4.ebuild, +dbdesigner-4.0.5.4-r1.ebuild:
   Fixed ebuild. Bug #217254
diff --git a/dev-util/dbdesigner/Manifest b/dev-util/dbdesigner/Manifest
index 7e1334e1e..ef8710bec 100644
--- a/dev-util/dbdesigner/Manifest
+++ b/dev-util/dbdesigner/Manifest
@@ -1,4 +1,4 @@
 DIST DBDesigner4.0.5.4.tar.gz 9339411 RMD160 57ae660085ca1e085183f41485ca67bed1c48873 SHA1 3692bbd059f5e2b3c74e9746c0a82f90b4349009 SHA256 10a0e541de6447954080649502ee5d08720aad5f835ac8983af76131f375c659
-EBUILD dbdesigner-4.0.5.4-r1.ebuild 1636 RMD160 3960c4c0e9baf5f227fbedbce74ea3435a001d40 SHA1 04ffc4b7bac599c11dc539e9e88c21dcc3fed5bd SHA256 5d7ce47e3bd57d8577fee85eeb2ca0ec4ba1dda9b7df3b2177363aa38f0dc6ab
-MISC ChangeLog 677 RMD160 61d9168bfc9bed39a13732c4b7df147e22285ca5 SHA1 4508a9b936781c5ec28bc0533f09cdf685dce7ad SHA256 21e15ae209ecbcdc25aa4e78180f40af44972645fe2630192e017456a97145a1
+EBUILD dbdesigner-4.0.5.4-r1.ebuild 2099 RMD160 11f25fa086517d13192292ec8db01d27c53804b5 SHA1 c8143bbae3425f244b040dd445766ef98ad806fe SHA256 29966462bce812816534615e09e0491480d246f895ea88e7e5962698467158ae
+MISC ChangeLog 858 RMD160 1fb097f753a0bd92bcda7c859952ff938221721f SHA1 18a94d6af876078e96717d0422d61f93c6dfe264 SHA256 152682385b987f7a8f9e064371848666fa03a1db8abee25fcfeabc5b7291cfa0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-util/dbdesigner/dbdesigner-4.0.5.4-r1.ebuild b/dev-util/dbdesigner/dbdesigner-4.0.5.4-r1.ebuild
index 0835bb872..4c192b016 100644
--- a/dev-util/dbdesigner/dbdesigner-4.0.5.4-r1.ebuild
+++ b/dev-util/dbdesigner/dbdesigner-4.0.5.4-r1.ebuild
@@ -4,33 +4,55 @@
 
 inherit eutils
 
+MY_PN="DBDesigner4"
+
 DESCRIPTION="QT Database Designer for mysql"
 HOMEPAGE="http://www.fabforce.net"
-SRC_URI="http://downloads.mysql.com/DBDesigner4/DBDesigner${PV}.tar.gz"
+SRC_URI="http://downloads.mysql.com/${MY_PN}/DBDesigner${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND="sys-libs/lib-compat x11-libs/kylixlibs3-borqt"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/lib-compat
+	x11-libs/kylixlibs3-borqt"
+DEPEND=""
 
-S=${WORKDIR}/DBDesigner4
-INSTALLDIR=/opt/DBDesigner4
+S=${WORKDIR}/${MY_PN}
 
+LL="opt/${MY_PN}/Linuxlib"
+QA_PRESTRIPPED="${LL}/libdbxoodbc.so
+	${LL}/libDbxSQLite.so.2.8.5
+	${LL}/sqlite.so
+	${LL}/libqt.so.2.3.2
+	${LL}/bplrtl.so.6.9.0
+	${LL}/libmidas.so.1.0
+	${LL}/libqtintf-6.9.0-qt2.3.so
+	opt/${MY_PN}/DBDplugin_SimpleWebFront
+	opt/${MY_PN}/DBDplugin_HTMLReport
+	opt/${MY_PN}/DBDplugin_DataImporter
+	opt/${MY_PN}/${MY_PN}"
+QA_TEXTRELS="${LL}/libsqlora.so.1.0
+	${LL}/libmidas.so.1.0
+	${LL}/libpng.so.2.1.0.12"
 
 src_install() {
-	insinto "${INSTALLDIR}"
-	doins -r "${S}"/*
+	local optdir=/opt/${MY_PN}
+
+	insinto "${optdir}"
+	doins -r "${S}"/* || die "doins failed"
+
 	ebegin "Fixing permissions of DBDesigner4 executable"
-	fperms 111 "${INSTALLDIR}"/DBDesigner4
+	fperms 111 "${optdir}/${MY_PN}"
 	eend
+
 	ebegin "Fixing permissions of startdbd executable"
-	fperms 111 "${INSTALLDIR}"/startdbd
+	fperms 111 "${optdir}"/startdbd
 	eend
-	cd "${D}"/"${INSTALLDIR}"/Linuxlib
+
+	cd "${D}/${INSTALLDIR}"/Linuxlib
 	einfo "Creating symlinks"
-	ln -sfn"${D}"/opt/kylix3/libborqt-6.9-qt2.3.so libqt.so.2
+	ln -sfn "${D}"/opt/kylix3/libborqt-6.9-qt2.3.so libqt.so.2
 	ln -sfn bplrtl.so.6.9.0 bplrtl.so.6.9
 	ln -sfn dbxres.en.1.0 dbxres.en.1
 	ln -sfn libmidas.so.1.0 libmidas.so.1
@@ -43,15 +65,18 @@ src_install() {
 	ln -sfn liblcms.so.1.0.9 liblcms.so
 	ln -sfn libpng.so.2.1.0.12 libpng.so.2
 	ln -sfn libstdc++.so.5.0.0 libstdc++.so.5
-	dobin "${S}"/startdbd
+	cd "${S}"
+
+	dobin startdbd || die "dobin failed"
+
 	ebegin "Creating Icons"
-	newicon "${S}"/Gfx/Icon48.xpm Icon48.xpm
-	make_desktop_entry startdbd DBDesigner4 Icon48.xpm "Applications;Development"
+	newicon Gfx/Icon48.xpm Icon48.xpm
+	make_desktop_entry startdbd ${MY_PN} Icon48.xpm "Applications;Development"
 	eend
 }
 
 pkg_postinst() {
-	elog ""
-	elog "DBDesigner4 is now installed. Use startdbd command to run it"
-	elog ""
+	einfo
+	einfo "DBDesigner4 is now installed. Use startdbd command to run it"
+	einfo
 }