Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 428654 Details for
Bug 577850
=dev-db/tora-3.2 version bump and update live ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
tora-9999.ebuild.patch
tora-9999.ebuild.patch (text/plain), 3.59 KB, created by
Sergey S. Starikoff
on 2016-03-20 17:12:50 UTC
(
hide
)
Description:
tora-9999.ebuild.patch
Filename:
MIME Type:
Creator:
Sergey S. Starikoff
Created:
2016-03-20 17:12:50 UTC
Size:
3.59 KB
patch
obsolete
>--- /usr/portage/gentoo/dev-db/tora/tora-9999.ebuild 2015-08-09 03:38:18.000000000 +0300 >+++ /usr/portage/local/dev-db/tora/tora-9999.ebuild 2016-03-20 19:05:57.226242573 +0300 >@@ -1,48 +1,50 @@ >-# Copyright 1999-2015 Gentoo Foundation >+# Copyright 1999-2013 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Id$ >+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-3.0.0_pre20140918.ebuild,v 1.5 2014/09/18 Exp $ > > EAPI=5 > > inherit cmake-utils eutils > > if [[ ${PV} == 9999 ]]; then >- ESVN_REPO_URI="https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora" >- inherit subversion >- SRC_URI="" >+ EGIT_REPO_URI="https://github.com/tora-tool/tora" >+ inherit git-2 >+ KEYWORDS="" > else >- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" >+ SRC_URI="${PN}-master.tar.gz" >+ KEYWORDS="~amd64 ~x86" > fi > > DESCRIPTION="TOra - Toolkit For Oracle" >-HOMEPAGE="http://torasql.com/" >-IUSE="debug mysql oracle oci8-instant-client postgres" >+HOMEPAGE="https://github.com/tora-tool/tora/wiki" >+IUSE="debug mysql pch postgres +qt5" > > SLOT="0" > LICENSE="GPL-2" >-KEYWORDS="" > >-DEPEND=" >- virtual/pkgconfig >+RDEPEND=" > dev-libs/ferrisloki > x11-libs/qscintilla >- dev-qt/qtgui:4 >- dev-qt/qtsql:4[mysql?,postgres?] >- dev-qt/qtxmlpatterns:4 >- oci8-instant-client? ( dev-db/oracle-instantclient-basic ) >+ qt5? ( dev-qt/qtgui:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtxmlpatterns:5 ) >+ !qt5? ( dev-qt/qtgui:4 dev-qt/qtsql:4[mysql?,postgres?] dev-qt/qtxmlpatterns:4 ) >+ dev-db/oracle-instantclient[sdk] > postgres? ( dev-db/postgresql ) > " >-RDEPEND="${DEPEND}" >+ >+DEPEND=" >+ virtual/pkgconfig >+ ${RDEPEND} >+" >+ >+S="${WORKDIR}/${PN}-master" > > pkg_setup() { >- if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then >+ if [ -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 >@@ -50,11 +52,12 @@ > } > > src_prepare() { >+ # Clean 3rd-party dependencies to ensure usage right ones: >+ #rm -rf extlibs/loki* || die # for dev-libs/ferrisloki see bug #383109 >+ # > sed -i \ > -e "/COPYING/ d" \ > CMakeLists.txt || die "Removal of COPYING file failed" >- # 'svn info' needs .svn subdirectory >- [[ ${PV} != 9999 ]] || cp -a "${ESVN_WC_PATH}"/.svn .svn || die > # bug 547520 > grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ > die 'Removal of $$ORIGIN failed' >@@ -62,19 +65,19 @@ > > src_configure() { > local mycmakeargs=() >- if use oracle || use oci8-instant-client ; then >- mycmakeargs=(-DENABLE_ORACLE=ON) >- else >- mycmakeargs=(-DENABLE_ORACLE=OFF) >- fi >+ mycmakeargs=(-DENABLE_ORACLE=ON) >+ # IMB DB2 support is very initial and for 2016-03-13 not planned to be complete >+ mycmakeargs+=(-DENABLE_DB2=OFF) > mycmakeargs+=( > -DWANT_RPM=OFF > -DWANT_BUNDLE=OFF > -DWANT_BUNDLE_STANDALONE=OFF >+ $(cmake-utils_use_use pch) > -DWANT_INTERNAL_QSCINTILLA=OFF > -DWANT_INTERNAL_LOKI=OFF > -DLOKI_LIBRARY="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so" > -DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" >+ $(cmake-utils_use qt5 QT5_BUILD) > $(cmake-utils_use_enable postgres PGSQL) > $(cmake-utils_use_want debug) > # path variables >@@ -85,6 +88,7 @@ > > src_install() { > cmake-utils_src_install >- doicon src/icons/${PN}.xpm >- domenu src/${PN}.desktop >+ # >+ doicon src/icons/${PN}.xpm || die >+ domenu src/${PN}.desktop || die > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 577850
:
428654
|
476244
|
499596
|
505052
|
511586
|
511790