Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 499596 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-3.2.ebuild.diff
tora-3.2.ebuild.diff (text/plain), 3.63 KB, created by
Andreas Sturmlechner
on 2017-10-21 22:33:13 UTC
(
hide
)
Description:
tora-3.2.ebuild.diff
Filename:
MIME Type:
Creator:
Andreas Sturmlechner
Created:
2017-10-21 22:33:13 UTC
Size:
3.63 KB
patch
obsolete
>--- tora-3.0.0_pre20140929-r2.ebuild 2017-10-21 23:44:55.602400642 +0200 >+++ tora-3.2.ebuild 2017-10-22 00:27:24.046485360 +0200 >@@ -1,84 +1,94 @@ >-# Copyright 1999-2016 Gentoo Foundation >+# Copyright 1999-2017 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > >-EAPI=5 >+EAPI=6 > > inherit cmake-utils eutils > > if [[ ${PV} == 9999 ]]; then >- ESVN_REPO_URI="https://svn.code.sf.net/p/tora/code/trunk/tora" >- inherit subversion >- SRC_URI="" >+ EGIT_REPO_URI="https://github.com/tora-tool/tora" >+ inherit git-r3 > else >- SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz" >+ SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz" >+ KEYWORDS="~amd64 ~x86" > fi > >-DESCRIPTION="TOra - Toolkit For Oracle" >-HOMEPAGE="http://torasql.com/" >-IUSE="debug mysql postgres" >+DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" >+HOMEPAGE="https://github.com/tora-tool/tora/wiki" >+IUSE="doc mysql oracle pch postgres" > > SLOT="0" > LICENSE="GPL-2" >-KEYWORDS="~amd64 ~x86" > > RDEPEND=" > dev-libs/ferrisloki >- x11-libs/qscintilla:=[qt4(-)] >- dev-qt/qtgui:4 >- dev-qt/qtsql:4[mysql?,postgres?] >- dev-qt/qtxmlpatterns:4 >- =dev-db/oracle-instantclient-basic-11* >+ dev-qt/qtcore:5 >+ dev-qt/qtgui:5 >+ dev-qt/qtnetwork:5 >+ dev-qt/qtsql:5[mysql?,postgres?] >+ dev-qt/qtwidgets:5 >+ dev-qt/qtxml:5 >+ dev-qt/qtxmlpatterns:5 >+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >+ oracle? ( =dev-db/oracle-instantclient-basic-11* ) > postgres? ( dev-db/postgresql:* ) > " >-DEPEND=" >+DEPEND="${RDEPEND} >+ dev-qt/linguist:5 > virtual/pkgconfig >- ${RDEPEND} >+ doc? ( app-doc/doxygen ) > " > > pkg_setup() { >- if [ -z "$ORACLE_HOME" ] ; then >+ if use oracle && [[ -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 "You can download the Oracle software from" >- eerror "http://otn.oracle.com/software/content.html" >+ eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html" > die > fi > } > > src_prepare() { >- sed -i \ >- -e "/COPYING/ d" \ >- CMakeLists.txt || die "Removal of COPYING file failed" >+ cmake-utils_src_prepare >+ >+ # fixed in master, only care about recent qscintilla lib name: >+ sed -e "/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/" \ >+ -i cmake/modules/FindQScintilla.cmake || die "Failed to fix FindQScintilla.cmake" >+ >+ rm -r extlibs/{loki*,qscintilla2} || die # ferrisloki, bug #383109 >+ >+ sed -e "/COPYING/ d" \ >+ -i CMakeLists.txt || die "Removal of COPYING file failed" >+ > # bug 547520 > grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ > die 'Removal of $$ORIGIN failed' > } > > src_configure() { >- local mycmakeargs=() >- mycmakeargs=(-DENABLE_ORACLE=ON) >- mycmakeargs+=( >- -DWANT_RPM=OFF >- -DWANT_BUNDLE=OFF >- -DWANT_BUNDLE_STANDALONE=OFF >- -DWANT_INTERNAL_QSCINTILLA=OFF >+ local mycmakeargs=( >+ -DENABLE_DB2=OFF >+ -DQT5_BUILD=ON > -DWANT_INTERNAL_LOKI=OFF >+ -DWANT_INTERNAL_QSCINTILLA=OFF >+ -DWANT_RPM=OFF > -DLOKI_LIBRARY="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so" > -DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" >- $(cmake-utils_use_enable postgres PGSQL) >- $(cmake-utils_use_want debug) >- # path variables >- -DTORA_DOC_DIR=share/doc/${PF} >+ $(cmake-utils_use_find_package doc Doxygen) >+ -DENABLE_ORACLE=$(usex oracle) >+ -DUSE_PCH=$(usex pch) >+ -DENABLE_PGSQL=$(usex postgres) > ) > cmake-utils_src_configure > } > > src_install() { > cmake-utils_src_install >- # >+ > 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