| 1 |
scarabeus 11/01/30 15:06:37 |
| 2 |
|
| 3 |
Modified: quassel-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Move live ebuild to eapi4. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.56 net-irc/quassel/quassel-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.56&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.56&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.55&r2=1.56 |
| 15 |
|
| 16 |
Index: quassel-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
| 19 |
retrieving revision 1.55 |
| 20 |
retrieving revision 1.56 |
| 21 |
diff -u -r1.55 -r1.56 |
| 22 |
--- quassel-9999.ebuild 4 Nov 2010 14:46:11 -0000 1.55 |
| 23 |
+++ quassel-9999.ebuild 30 Jan 2011 15:06:36 -0000 1.56 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.55 2010/11/04 14:46:11 scarabeus Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.56 2011/01/30 15:06:36 scarabeus Exp $ |
| 30 |
|
| 31 |
-EAPI=3 |
| 32 |
+EAPI=4 |
| 33 |
|
| 34 |
EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git" |
| 35 |
EGIT_BRANCH="master" |
| 36 |
@@ -55,14 +55,6 @@ |
| 37 |
server? ( ${SERVER_RDEPEND} ) |
| 38 |
X? ( ${GUI_RDEPEND} ) |
| 39 |
) |
| 40 |
- !monolithic? ( |
| 41 |
- !server? ( |
| 42 |
- !X? ( |
| 43 |
- ${SERVER_RDEPEND} |
| 44 |
- ${GUI_RDEPEND} |
| 45 |
- ) |
| 46 |
- ) |
| 47 |
- ) |
| 48 |
" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
|
| 51 |
@@ -70,15 +62,18 @@ |
| 52 |
|
| 53 |
S="${WORKDIR}/${P/_/-}" |
| 54 |
|
| 55 |
-pkg_setup() { |
| 56 |
- if ! use monolithic && ! use server && ! use X ; then |
| 57 |
- ewarn "You have to build at least one of the monolithic client (USE=monolithic)," |
| 58 |
- ewarn "the quasselclient (USE=X) or the quasselcore (USE=server)." |
| 59 |
- echo |
| 60 |
- ewarn "Enabling monolithic by default." |
| 61 |
- FORCED_MONO="yes" |
| 62 |
- fi |
| 63 |
+REQUIRED_USE=" |
| 64 |
+ || ( X server monolithic ) |
| 65 |
+ crypt? ( || ( server monolithic ) ) |
| 66 |
+ postgres? ( || ( server monolithic ) ) |
| 67 |
+ kde? ( || ( X monolithic ) ) |
| 68 |
+ phonon? ( || ( X monolithic ) ) |
| 69 |
+ dbus? ( || ( X monolithic ) ) |
| 70 |
+ ayatana? ( || ( X monolithic ) ) |
| 71 |
+ webkit? ( || ( X monolithic ) ) |
| 72 |
+" |
| 73 |
|
| 74 |
+pkg_setup() { |
| 75 |
if use server; then |
| 76 |
QUASSEL_DIR=/var/lib/${PN} |
| 77 |
QUASSEL_USER=${PN} |
| 78 |
@@ -104,8 +99,6 @@ |
| 79 |
"-DEMBED_DATA=OFF" |
| 80 |
) |
| 81 |
|
| 82 |
- [[ ${FORCED_MONO} == "yes" ]] && mycmakeargs+=( '-DWANT_MONO=ON' ) |
| 83 |
- |
| 84 |
cmake-utils_src_configure |
| 85 |
} |
| 86 |
|
| 87 |
@@ -128,7 +121,7 @@ |
| 88 |
} |
| 89 |
|
| 90 |
pkg_postinst() { |
| 91 |
- if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then |
| 92 |
+ if use monolithic && use ssl ; then |
| 93 |
elog "Information on how to enable SSL support for client/core connections" |
| 94 |
elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
| 95 |
fi |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.120 net-irc/quassel/ChangeLog |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.120&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.120&content-type=text/plain |
| 103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.119&r2=1.120 |
| 104 |
|
| 105 |
Index: ChangeLog |
| 106 |
=================================================================== |
| 107 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
| 108 |
retrieving revision 1.119 |
| 109 |
retrieving revision 1.120 |
| 110 |
diff -u -r1.119 -r1.120 |
| 111 |
--- ChangeLog 4 Nov 2010 14:46:11 -0000 1.119 |
| 112 |
+++ ChangeLog 30 Jan 2011 15:06:36 -0000 1.120 |
| 113 |
@@ -1,6 +1,9 @@ |
| 114 |
# ChangeLog for net-irc/quassel |
| 115 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.119 2010/11/04 14:46:11 scarabeus Exp $ |
| 117 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.120 2011/01/30 15:06:36 scarabeus Exp $ |
| 119 |
+ |
| 120 |
+ 30 Jan 2011; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild: |
| 121 |
+ Move live ebuild to eapi4. |
| 122 |
|
| 123 |
04 Nov 2010; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild, |
| 124 |
metadata.xml: |
Archives