Install icon and desktop file. Bug 352671 by Disaster.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 4678fe7f0b086c4c6d0f83bb3eaab764b4aa5f90..5f1b27c4a3e0cb5259b9ec5ae8018b73cdb12438 100644 (file)
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.90 2011/12/10 01:53:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.91 2011/12/10 02:04:05 floppym Exp $
+
+*tora-2.1.3-r1 (10 Dec 2011)
+
+  10 Dec 2011; Mike Gilbert <floppym@gentoo.org> +tora-2.1.3-r1.ebuild:
+  Install icon and desktop file. Bug 352671 by Disaster.
 
   10 Dec 2011; Mike Gilbert <floppym@gentoo.org> tora-2.1.1.ebuild:
   Apply qt47 patch to stable ebuild to fix bug 375809.

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index a20e910b5b41717498bd4075a03a282ff5b8b241..833218137c80350c9a8258702015b44d802cdd70 100644 (file)
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -5,13 +5,14 @@ AUX tora-2.1.2-qt47.patch 446 RMD160 9453e46dbe60e7ab441ef802b241c3ac3da76026 SH
 DIST tora-2.1.1.tar.gz 5356473 RMD160 1f81d512480fdfba2d66e2cd8665da8ab70d2de3 SHA1 61a2471fd9bac2578e6fa556f98d90976ea3ef9d SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663
 DIST tora-2.1.3.tar.gz 12284451 RMD160 084d90c94184939e24ac94109ff7940a33bed1d7 SHA1 d33ea3bafb09c5382ef4e0cb0e8ca4ed848a9155 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b
 EBUILD tora-2.1.1.ebuild 1832 RMD160 c7a775a7708683452edf146950eafde8db14a89d SHA1 7daaf3ef0280d34c4ba06ff443e9d8e671fb2eb0 SHA256 93d20b1990a126bd5900268477f0165311fd80b8fd3a3f9cd1b95914947b55a6
+EBUILD tora-2.1.3-r1.ebuild 1907 RMD160 0645437f467c74962ae43b45296da0f3c0b51138 SHA1 2baa3b4a0db5cab74d544d071baad8b928ee3c6e SHA256 6f2623bed6f6608e76e16d0441a6d6e817458ccb58f676a3b9ec429c99371be3
 EBUILD tora-2.1.3.ebuild 1792 RMD160 9760f0f039f3147f3970bc5d438cf5291e402703 SHA1 2c50d577356583dd200c723ae9a09cdb3dfa21b1 SHA256 be7541a08b502201ea65a37cc28f7a49217498b770800852b6eb83b6f2e402e3
-MISC ChangeLog 13406 RMD160 78bb462baacb5fdaa9a7af76f526a16ba8ac390a SHA1 2b307f6c9b57434ef237361a25fab276951c9464 SHA256 1c2f7c2f391db11a1cf6e6038b77114a87e04514e71bba9322bd34186a13cc4f
+MISC ChangeLog 13566 RMD160 16894dc164b3623934e3d576d73cb3701ccdc9d0 SHA1 353cfe371e0e1b4b9ee3e97aefd5ba4cbd649bc1 SHA256 4f6d1361543953adba63677a846b0d13998c4ca5be980d78892171dadf9b6c1a
 MISC metadata.xml 524 RMD160 20a359cb68bebb8e5c42ba7c0809d402f5a06c16 SHA1 27ed6bfb99b6bd3e7366ffe043dc59fe6e9cbceb SHA256 85c3fad20229ac24c3e919503fa28e779842ebcffbde68a1292a8b3be1032db1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7iu5sACgkQC77qH+pIQ6TawwEAx9krGKze3AUv7GHkmPDFLwEb
-SB4GJ5r31D45i9S9HHUA/A0TySqtcyaTEpWLAmXLKBa16OD8k/48L50MfbQQ2+H8
-=37T2
+iF4EAREIAAYFAk7ivh4ACgkQC77qH+pIQ6RqowD+P7qBwZP5FSGUEj6piDYdLIGA
+8dZWW+9suE60TRbtM6kA/3i8o4DrmWK1WmE6LiWF3oavIOLs36kdrcpnmdhksDtm
+=ETp5
 -----END PGP SIGNATURE-----

diff --git a/dev-db/tora/tora-2.1.3-r1.ebuild b/dev-db/tora/tora-2.1.3-r1.ebuild
new file mode 100644 (file)
index 0000000..6ae84c1
--- /dev/null
+++ b/dev-db/tora/tora-2.1.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r1.ebuild,v 1.1 2011/12/10 02:04:05 floppym Exp $
+
+EAPI=2
+
+inherit cmake-utils eutils
+
+DESCRIPTION="TOra - Toolkit For Oracle"
+HOMEPAGE="http://tora.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+IUSE="debug mysql oracle oci8-instant-client postgres"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="${DEPEND}"
+DEPEND="
+       x11-libs/qscintilla
+       x11-libs/qt-gui:4
+       x11-libs/qt-sql:4[mysql?,postgres?]
+       x11-libs/qt-xmlpatterns:4
+       oci8-instant-client? (
+               dev-db/oracle-instantclient-basic
+               dev-db/oracle-instantclient-sqlplus
+       )
+       postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+       if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then
+               eerror "ORACLE_HOME variable is not set."
+               eerror
+               eerror "You must install Oracle >= 8i client for Linux in"
+               eerror "order to compile TOra with Oracle support."
+               eerror
+               eerror "Otherwise specify -oracle in your USE variable."
+               eerror
+               eerror "You can download the Oracle software from"
+               eerror "http://otn.oracle.com/software/content.html"
+               die
+       fi
+}
+
+src_prepare() {
+       sed -i \
+               -e "/COPYING/ d" \
+               CMakeLists.txt || die "Removal of COPYING file failed"
+}
+
+src_configure() {
+       local mycmakeargs=()
+       if use oracle || use oci8-instant-client ; then
+               mycmakeargs=(-DENABLE_ORACLE=ON)
+       else
+               mycmakeargs=(-DENABLE_ORACLE=OFF)
+       fi
+       mycmakeargs+=(
+               -DWANT_RPM=OFF
+               -DWANT_BUNDLE=OFF
+               -DWANT_BUNDLE_STANDALONE=OFF
+               -DWANT_INTERNAL_QSCINTILLA=OFF
+               $(cmake-utils_use_enable postgres PGSQL)
+               $(cmake-utils_use_want debug)
+               # path variables
+               -DTORA_DOC_DIR=share/doc/${PF}
+       )
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+       doicon src/icons/${PN}.xpm || die
+       domenu debian/${PN}.desktop || die
+}