| 1 |
johu 14/04/01 23:08:36 |
| 2 |
|
| 3 |
Modified: quassel-9999.ebuild ChangeLog |
| 4 |
Added: quassel-0.10.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump. Update live ebuild to use git-r3 eclass and emove ancient vars. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.70 net-irc/quassel/quassel-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.70&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.70&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.69&r2=1.70 |
| 16 |
|
| 17 |
Index: quassel-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
| 20 |
retrieving revision 1.69 |
| 21 |
retrieving revision 1.70 |
| 22 |
diff -u -r1.69 -r1.70 |
| 23 |
--- quassel-9999.ebuild 27 Mar 2014 00:44:32 -0000 1.69 |
| 24 |
+++ quassel-9999.ebuild 1 Apr 2014 23:08:36 -0000 1.70 |
| 25 |
@@ -1,19 +1,15 @@ |
| 26 |
# Copyright 1999-2014 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.69 2014/03/27 00:44:32 mrueg Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.70 2014/04/01 23:08:36 johu Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
inherit cmake-utils eutils pax-utils user versionator |
| 34 |
|
| 35 |
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git" |
| 36 |
-EGIT_BRANCH="master" |
| 37 |
-[[ "${PV}" == "9999" ]] && inherit git-2 |
| 38 |
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel" |
| 39 |
+[[ "${PV}" == "9999" ]] && inherit git-r3 |
| 40 |
|
| 41 |
-QT_MINIMAL="4.6.0" |
| 42 |
-KDE_MINIMAL="4.4" |
| 43 |
- |
| 44 |
-DESCRIPTION="Qt4/KDE4 IRC client supporting a remote daemon for 24/7 connectivity." |
| 45 |
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity" |
| 46 |
HOMEPAGE="http://quassel-irc.org/" |
| 47 |
[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2" |
| 48 |
|
| 49 |
@@ -23,34 +19,34 @@ |
| 50 |
IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X" |
| 51 |
|
| 52 |
SERVER_RDEPEND=" |
| 53 |
- >=dev-qt/qtscript-${QT_MINIMAL}:4 |
| 54 |
+ dev-qt/qtscript:4 |
| 55 |
crypt? ( |
| 56 |
app-crypt/qca:2 |
| 57 |
app-crypt/qca-ossl |
| 58 |
) |
| 59 |
- !postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
| 60 |
- postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] ) |
| 61 |
+ !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
| 62 |
+ postgres? ( dev-qt/qtsql:4[postgres] ) |
| 63 |
syslog? ( virtual/logger ) |
| 64 |
" |
| 65 |
|
| 66 |
GUI_RDEPEND=" |
| 67 |
- >=dev-qt/qtgui-${QT_MINIMAL}:4 |
| 68 |
+ dev-qt/qtgui:4 |
| 69 |
ayatana? ( dev-libs/libindicate-qt ) |
| 70 |
dbus? ( |
| 71 |
- >=dev-qt/qtdbus-${QT_MINIMAL}:4 |
| 72 |
+ dev-qt/qtdbus:4 |
| 73 |
dev-libs/libdbusmenu-qt |
| 74 |
) |
| 75 |
kde? ( |
| 76 |
- >=kde-base/kdelibs-${KDE_MINIMAL} |
| 77 |
- >=kde-base/oxygen-icons-${KDE_MINIMAL} |
| 78 |
+ kde-base/kdelibs:4 |
| 79 |
+ kde-base/oxygen-icons:4 |
| 80 |
ayatana? ( kde-misc/plasma-widget-message-indicator ) |
| 81 |
) |
| 82 |
- phonon? ( || ( media-libs/phonon >=dev-qt/qtphonon-${QT_MINIMAL}:4 ) ) |
| 83 |
- webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 ) |
| 84 |
+ phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) |
| 85 |
+ webkit? ( dev-qt/qtwebkit:4 ) |
| 86 |
" |
| 87 |
|
| 88 |
RDEPEND=" |
| 89 |
- >=dev-qt/qtcore-${QT_MINIMAL}:4[ssl?] |
| 90 |
+ dev-qt/qtcore:4[ssl?] |
| 91 |
monolithic? ( |
| 92 |
${SERVER_RDEPEND} |
| 93 |
${GUI_RDEPEND} |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.167 net-irc/quassel/ChangeLog |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.167&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.167&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.166&r2=1.167 |
| 102 |
|
| 103 |
Index: ChangeLog |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
| 106 |
retrieving revision 1.166 |
| 107 |
retrieving revision 1.167 |
| 108 |
diff -u -r1.166 -r1.167 |
| 109 |
--- ChangeLog 1 Apr 2014 08:47:01 -0000 1.166 |
| 110 |
+++ ChangeLog 1 Apr 2014 23:08:36 -0000 1.167 |
| 111 |
@@ -1,6 +1,12 @@ |
| 112 |
# ChangeLog for net-irc/quassel |
| 113 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.166 2014/04/01 08:47:01 johu Exp $ |
| 115 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.167 2014/04/01 23:08:36 johu Exp $ |
| 116 |
+ |
| 117 |
+*quassel-0.10.0 (01 Apr 2014) |
| 118 |
+ |
| 119 |
+ 01 Apr 2014; Johannes Huber <johu@g.o> +quassel-0.10.0.ebuild, |
| 120 |
+ quassel-9999.ebuild: |
| 121 |
+ Version bump. Update live ebuild to use git-r3 eclass and emove ancient vars. |
| 122 |
|
| 123 |
01 Apr 2014; Johannes Huber <johu@g.o> metadata.xml: |
| 124 |
Add myself as maintainer acked by Patrick. |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
1.1 net-irc/quassel/quassel-0.10.0.ebuild |
| 129 |
|
| 130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0.ebuild?rev=1.1&view=markup |
| 131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-0.10.0.ebuild?rev=1.1&content-type=text/plain |
| 132 |
|
| 133 |
Index: quassel-0.10.0.ebuild |
| 134 |
=================================================================== |
| 135 |
# Copyright 1999-2014 Gentoo Foundation |
| 136 |
# Distributed under the terms of the GNU General Public License v2 |
| 137 |
# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0.ebuild,v 1.1 2014/04/01 23:08:36 johu Exp $ |
| 138 |
|
| 139 |
EAPI=5 |
| 140 |
|
| 141 |
inherit cmake-utils eutils pax-utils user versionator |
| 142 |
|
| 143 |
EGIT_REPO_URI="git://git.quassel-irc.org/quassel" |
| 144 |
[[ "${PV}" == "9999" ]] && inherit git-r3 |
| 145 |
|
| 146 |
DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity" |
| 147 |
HOMEPAGE="http://quassel-irc.org/" |
| 148 |
[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2" |
| 149 |
|
| 150 |
LICENSE="GPL-3" |
| 151 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris" |
| 152 |
SLOT="0" |
| 153 |
IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X" |
| 154 |
|
| 155 |
SERVER_RDEPEND=" |
| 156 |
dev-qt/qtscript:4 |
| 157 |
crypt? ( |
| 158 |
app-crypt/qca:2 |
| 159 |
app-crypt/qca-ossl |
| 160 |
) |
| 161 |
!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
| 162 |
postgres? ( dev-qt/qtsql:4[postgres] ) |
| 163 |
syslog? ( virtual/logger ) |
| 164 |
" |
| 165 |
|
| 166 |
GUI_RDEPEND=" |
| 167 |
dev-qt/qtgui:4 |
| 168 |
ayatana? ( dev-libs/libindicate-qt ) |
| 169 |
dbus? ( |
| 170 |
dev-qt/qtdbus:4 |
| 171 |
dev-libs/libdbusmenu-qt |
| 172 |
) |
| 173 |
kde? ( |
| 174 |
kde-base/kdelibs:4 |
| 175 |
kde-base/oxygen-icons:4 |
| 176 |
ayatana? ( kde-misc/plasma-widget-message-indicator ) |
| 177 |
) |
| 178 |
phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) |
| 179 |
webkit? ( dev-qt/qtwebkit:4 ) |
| 180 |
" |
| 181 |
|
| 182 |
RDEPEND=" |
| 183 |
dev-qt/qtcore:4[ssl?] |
| 184 |
monolithic? ( |
| 185 |
${SERVER_RDEPEND} |
| 186 |
${GUI_RDEPEND} |
| 187 |
) |
| 188 |
!monolithic? ( |
| 189 |
server? ( ${SERVER_RDEPEND} ) |
| 190 |
X? ( ${GUI_RDEPEND} ) |
| 191 |
) |
| 192 |
" |
| 193 |
DEPEND="${RDEPEND} |
| 194 |
kde? ( dev-util/automoc )" |
| 195 |
|
| 196 |
DOCS="AUTHORS ChangeLog README" |
| 197 |
|
| 198 |
S="${WORKDIR}/${P/_/-}" |
| 199 |
|
| 200 |
REQUIRED_USE=" |
| 201 |
|| ( X server monolithic ) |
| 202 |
crypt? ( || ( server monolithic ) ) |
| 203 |
postgres? ( || ( server monolithic ) ) |
| 204 |
syslog? ( || ( server monolithic ) ) |
| 205 |
kde? ( || ( X monolithic ) ) |
| 206 |
phonon? ( || ( X monolithic ) ) |
| 207 |
dbus? ( || ( X monolithic ) ) |
| 208 |
ayatana? ( || ( X monolithic ) ) |
| 209 |
webkit? ( || ( X monolithic ) ) |
| 210 |
" |
| 211 |
|
| 212 |
pkg_setup() { |
| 213 |
if use server; then |
| 214 |
QUASSEL_DIR=/var/lib/${PN} |
| 215 |
QUASSEL_USER=${PN} |
| 216 |
# create quassel:quassel user |
| 217 |
enewgroup "${QUASSEL_USER}" |
| 218 |
enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}" |
| 219 |
fi |
| 220 |
} |
| 221 |
|
| 222 |
src_configure() { |
| 223 |
local mycmakeargs=( |
| 224 |
$(cmake-utils_use_with ayatana LIBINDICATE) |
| 225 |
$(cmake-utils_use_want X QTCLIENT) |
| 226 |
$(cmake-utils_use_want server CORE) |
| 227 |
$(cmake-utils_use_want monolithic MONO) |
| 228 |
$(cmake-utils_use_with webkit) |
| 229 |
$(cmake-utils_use_with phonon) |
| 230 |
$(cmake-utils_use_with kde) |
| 231 |
$(cmake-utils_use_with dbus) |
| 232 |
$(cmake-utils_use_with ssl OPENSSL) |
| 233 |
$(cmake-utils_use_with syslog) |
| 234 |
$(cmake-utils_use_with !kde OXYGEN) |
| 235 |
$(cmake-utils_use_with crypt) |
| 236 |
"-DEMBED_DATA=OFF" |
| 237 |
) |
| 238 |
|
| 239 |
cmake-utils_src_configure |
| 240 |
} |
| 241 |
|
| 242 |
src_install() { |
| 243 |
cmake-utils_src_install |
| 244 |
|
| 245 |
if use server ; then |
| 246 |
# needs PAX marking wrt bug#346255 |
| 247 |
pax-mark m "${ED}/usr/bin/quasselcore" |
| 248 |
|
| 249 |
# prepare folders in /var/ |
| 250 |
keepdir "${QUASSEL_DIR}" |
| 251 |
fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}" |
| 252 |
|
| 253 |
# init scripts |
| 254 |
newinitd "${FILESDIR}"/quasselcore.init quasselcore |
| 255 |
newconfd "${FILESDIR}"/quasselcore.conf quasselcore |
| 256 |
|
| 257 |
# logrotate |
| 258 |
insinto /etc/logrotate.d |
| 259 |
newins "${FILESDIR}/quassel.logrotate" quassel |
| 260 |
fi |
| 261 |
} |
| 262 |
|
| 263 |
pkg_postinst() { |
| 264 |
if use monolithic && use ssl ; then |
| 265 |
elog "Information on how to enable SSL support for client/core connections" |
| 266 |
elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
| 267 |
fi |
| 268 |
|
| 269 |
if use server; then |
| 270 |
einfo "If you want to generate SSL certificate remember to run:" |
| 271 |
einfo " emerge --config =${CATEGORY}/${PF}" |
| 272 |
fi |
| 273 |
|
| 274 |
if use server || use monolithic ; then |
| 275 |
einfo "Quassel can use net-misc/oidentd package if installed on your system." |
| 276 |
einfo "Consider installing it if you want to run quassel within identd daemon." |
| 277 |
fi |
| 278 |
|
| 279 |
# temporary info mesage |
| 280 |
if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then |
| 281 |
echo |
| 282 |
ewarn "Please note that all configuration moved from" |
| 283 |
ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/" |
| 284 |
ewarn "to: ${QUASSEL_DIR}." |
| 285 |
echo |
| 286 |
ewarn "For migration, stop the core, move quasselcore files (pretty much" |
| 287 |
ewarn "everything apart from quasselclient.conf and settings.qss) into" |
| 288 |
ewarn "new location and then start server again." |
| 289 |
fi |
| 290 |
} |
| 291 |
|
| 292 |
pkg_config() { |
| 293 |
if use server && use ssl; then |
| 294 |
# generate the pem file only when it does not already exist |
| 295 |
if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then |
| 296 |
einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" |
| 297 |
openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ |
| 298 |
-keyout "${QUASSEL_DIR}/quasselCert.pem" \ |
| 299 |
-out "${QUASSEL_DIR}/quasselCert.pem" |
| 300 |
# permissions for the key |
| 301 |
chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem" |
| 302 |
chmod 400 "${QUASSEL_DIR}/quasselCert.pem" |
| 303 |
else |
| 304 |
einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists." |
| 305 |
einfo "Remove it if you want to create new one." |
| 306 |
fi |
| 307 |
fi |
| 308 |
} |
Archives