| 1 |
commit: b5fd8b22da4b1ec35cd86f8be35593a1c94397c9 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 28 00:09:44 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 00:09:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b5fd8b22 |
| 7 |
|
| 8 |
x11-libs/libqxt: EAPI=6 and various cleanups |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
x11-libs/libqxt/libqxt-9999.ebuild | 33 +++++++++++++-------------------- |
| 13 |
1 file changed, 13 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-libs/libqxt/libqxt-9999.ebuild b/x11-libs/libqxt/libqxt-9999.ebuild |
| 16 |
index 0b661a5..5d18ba6 100644 |
| 17 |
--- a/x11-libs/libqxt/libqxt-9999.ebuild |
| 18 |
+++ b/x11-libs/libqxt/libqxt-9999.ebuild |
| 19 |
@@ -2,29 +2,26 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI=4 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
-inherit multilib qt4-r2 git-2 |
| 27 |
+inherit qmake-utils git-r3 |
| 28 |
|
| 29 |
DESCRIPTION="Extension library providing cross-platform utility classes for the Qt toolkit" |
| 30 |
-HOMEPAGE="http://libqxt.org/" |
| 31 |
+HOMEPAGE="https://bitbucket.org/libqxt/libqxt/wiki/Home" |
| 32 |
EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}.git" |
| 33 |
|
| 34 |
LICENSE="|| ( CPL-1.0 LGPL-2.1 )" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="" |
| 37 |
-IUSE="berkdb debug doc sql ssl web xscreensaver zeroconf" |
| 38 |
+IUSE="berkdb debug doc sql web xscreensaver zeroconf" |
| 39 |
|
| 40 |
COMMON_DEPEND=" |
| 41 |
- x11-libs/libXrandr |
| 42 |
- dev-qt/qtcore:4 |
| 43 |
+ dev-qt/designer:4 |
| 44 |
+ dev-qt/qtcore:4[ssl] |
| 45 |
dev-qt/qtgui:4 |
| 46 |
- berkdb? ( >=sys-libs/db-4.6 ) |
| 47 |
+ x11-libs/libXrandr |
| 48 |
+ berkdb? ( >=sys-libs/db-4.6:= ) |
| 49 |
sql? ( dev-qt/qtsql:4 ) |
| 50 |
- ssl? ( |
| 51 |
- >=dev-libs/openssl-0.9.8 |
| 52 |
- dev-qt/qtcore:4[ssl] |
| 53 |
- ) |
| 54 |
zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
| 55 |
" |
| 56 |
DEPEND="${COMMON_DEPEND} |
| 57 |
@@ -34,13 +31,13 @@ RDEPEND="${COMMON_DEPEND} |
| 58 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
| 59 |
" |
| 60 |
|
| 61 |
-DOCS="AUTHORS CHANGES README" |
| 62 |
+DOCS=( AUTHORS CHANGES README ) |
| 63 |
PATCHES=( |
| 64 |
"${FILESDIR}/${PN}-use-system-qdoc3.patch" |
| 65 |
) |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
- qt4-r2_src_prepare |
| 69 |
+ default |
| 70 |
|
| 71 |
# remove insecure runpath |
| 72 |
sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri || die |
| 73 |
@@ -53,12 +50,11 @@ src_configure() { |
| 74 |
-prefix "${EPREFIX}/usr" |
| 75 |
-libdir "${EPREFIX}/usr/$(get_libdir)" |
| 76 |
-docdir "${EPREFIX}/usr/share/doc/${PF}" |
| 77 |
- -qmake-bin "${EPREFIX}/usr/bin/qmake" |
| 78 |
+ -qmake-bin "$(qt4_get_bindir)/qmake" |
| 79 |
$(use debug && echo -debug || echo -release) |
| 80 |
$(use berkdb || echo -no-db -nomake berkeley) |
| 81 |
$(use doc || echo -nomake docs) |
| 82 |
$(use sql || echo -nomake sql) |
| 83 |
- $(use ssl || echo -no-openssl) |
| 84 |
$(use web || echo -nomake web) |
| 85 |
$(use zeroconf || echo -no-zeroconf -nomake zeroconf) |
| 86 |
) |
| 87 |
@@ -69,12 +65,9 @@ src_configure() { |
| 88 |
} |
| 89 |
|
| 90 |
src_compile() { |
| 91 |
- qt4-r2_src_compile |
| 92 |
+ default |
| 93 |
|
| 94 |
- if use doc; then |
| 95 |
- einfo "Building documentation" |
| 96 |
- emake docs |
| 97 |
- fi |
| 98 |
+ use doc && emake docs |
| 99 |
} |
| 100 |
|
| 101 |
pkg_postinst() { |
Archives