summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2009-09-04 20:06:38 +0000
committerDaniel Pielmeier <billie@gentoo.org>2009-09-04 20:06:38 +0000
commit017a934c2616008e475b66b12faa82f7bcd86d9c (patch)
tree38a69bf22e76a286929e4c7bd8acfe963e92c046 /net-irc/quassel
parentRemove old (diff)
downloadhistorical-017a934c2616008e475b66b12faa82f7bcd86d9c.tar.gz
historical-017a934c2616008e475b66b12faa82f7bcd86d9c.tar.bz2
historical-017a934c2616008e475b66b12faa82f7bcd86d9c.zip
Fix building with USE="-ssl" bug #283303. Remove old.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'net-irc/quassel')
-rw-r--r--net-irc/quassel/ChangeLog6
-rw-r--r--net-irc/quassel/Manifest17
-rw-r--r--net-irc/quassel/files/quassel-0.5_rc1-identity.cpp.patch13
-rw-r--r--net-irc/quassel/quassel-0.4.1.ebuild122
-rw-r--r--net-irc/quassel/quassel-0.5_rc1.ebuild6
5 files changed, 26 insertions, 138 deletions
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 7deaa97cd1a8..cbd5d5c8c165 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/quassel
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.54 2009/08/26 18:06:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.55 2009/09/04 20:06:38 billie Exp $
+
+ 04 Sep 2009; Pielmeier Daniel <billie@gentoo.org> -quassel-0.4.1.ebuild,
+ quassel-0.5_rc1.ebuild, +files/quassel-0.5_rc1-identity.cpp.patch:
+ Fix building with USE="-ssl" bug #283303. Remove old.
*quassel-0.4.3-r50 (26 Aug 2009)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 9a00270a630c..10ffb1db720e 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,25 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX quassel-0.5_rc1-identity.cpp.patch 598 RMD160 a8c49c1548bfd00a7f9ed62a654a269035301302 SHA1 9eb807313fd25335a280c6a34c192e99de0ee33c SHA256 1afbe7e80d2430ee4dadc60c8620ecb1625d67325fd113808d37eb8cf621e638
AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13f2d8da2ec68c6c8db019900abfa2334c1d0652 SHA256 b0e8873ac4a9a1ab78f8b96141e2c0159eeaf7e8ad0c7d8d3e53320fafcef1da
AUX quasselcore.init 1521 RMD160 f43a3c29f97cc44a6348d9ebf378d0531342cb05 SHA1 a7acf78a66a048a6cdc4cac54dae1f7e7d3d5b3f SHA256 eae2f4d8fb0a13f1bd449ea21d0493b9dcbed1df3417039ebf7b8c999f9a4a51
-DIST quassel-0.4.1.tar.bz2 3046742 RMD160 d7405d1ecec662e5a1323946f6a9b5761a39f6e1 SHA1 95705e4d09b34435d47328c4ac947102aef34751 SHA256 d79491906995b420da3c86fc9bf4370a2deec907560f66e8e33e540b14703ce2
DIST quassel-0.4.3.tar.bz2 2997468 RMD160 064bfbf46e9e9917b753e09eb1fc372e2ab1bb6e SHA1 badc19da15c84eff5c37e7810425a64e236465a3 SHA256 1136f4af4a20863b85d49e4a4e3b6287bb818f8d2ca9b402c6c52225355c8876
DIST quassel-0.5-rc1.tar.bz2 3192520 RMD160 4382a6d4cdf0582ccfb8cb19726b015d326c4f36 SHA1 628af99a14385cd656bdbe0ea940a882cd4ff240 SHA256 f91b6914ce2f6e304f2abda9a3d9cc91af88df80c9168ec698c75d3f54882d84
-EBUILD quassel-0.4.1.ebuild 3629 RMD160 04df9163a4d1d6414cb9d7040739ecc6a5432ac0 SHA1 cae298870e395412ed0a7fb7d9940b9a8c43c7fe SHA256 be571411aa873e66910895564d1504d491ef86863ab2ef4b50d0c11bf1d9ef1f
EBUILD quassel-0.4.3-r50.ebuild 3635 RMD160 703662785bd975effcd63861f17da8393a2b0332 SHA1 d2e074d2cc8896c8265a0b012082ffc70b7be245 SHA256 451048d3d5bdc29015fee1170f9d4b05c660df2ccaad357751b9c17bec5de8a4
EBUILD quassel-0.4.3.ebuild 3541 RMD160 15d58d19473444d616d1ab3758df6b49aa399872 SHA1 a1ddda934cd963cdcddbd3a94e867b5ece7e144a SHA256 0520ee0d855fcde0988bf6a6b76cbae3f4a7e9bec7d1d0eb6bfc6a2623bcb427
-EBUILD quassel-0.5_rc1.ebuild 3187 RMD160 5dd288589301e1c53318088cf55f291100513588 SHA1 c464b2171ea8961cd3e99cbfc65dfa4fe2249105 SHA256 5c571c68da2b7a103963a02e84f6e5220e28d275ea78aeccefd70e80cb06bf95
+EBUILD quassel-0.5_rc1.ebuild 3247 RMD160 81b643b9a2941e556f3e114195d55d60959addfd SHA1 2c6a03caf87a3d1ff29b9851bfb9ac4703f1fe01 SHA256 f7190eb4f063606fab4cda304b639718b06ad7c7f6feed0122acd43dee86c0c0
EBUILD quassel-9999.ebuild 3160 RMD160 23ddf2efd11b60301a7c339f7a0d34c91076cf5a SHA1 29767ad821ba0a6b18ef0914f05426fe65f3700b SHA256 ce1c85e549a38af9062ebbd6890c5179a48ffa2562b28ac328f3ceadc72d6b19
-MISC ChangeLog 10625 RMD160 09f95fbc3c40cb6c9a91fa87685f8ab3f6f239b5 SHA1 547589ce119693190a9e4380cadacaa7d9defc17 SHA256 1d7e5413e83514565bea56aae2fdd856405d27df4daa63fa517b2ea2dc19d806
+MISC ChangeLog 10823 RMD160 2bee6dc0f95fc6bd8343957da92dec88407201c6 SHA1 b255b6245d17d4c25591f51d197893d219b13371 SHA256 eddf255a5cdc46ee7d1dbd3cd605254210e9fcefef2ce87b653bd97fdc042b23
MISC metadata.xml 1555 RMD160 b81478435fd42bd616a6c7036172a2c912cfef44 SHA1 3fcc222d2ffa2494a83f43bb51d736cf2f5f99d8 SHA256 2fe10d7e5d141dba72d1d770e97ca0c3c937bc89324a024e6e3974b62a47d507
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqVeZEACgkQHB6c3gNBRYfeWwCbBn3kdx3//pBbumdGoL7nQskj
-AqAAnjrzcsxaHsiJHpO9ePlJBTgzEPNw
-=S1zg
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/quassel-0.5_rc1-identity.cpp.patch b/net-irc/quassel/files/quassel-0.5_rc1-identity.cpp.patch
new file mode 100644
index 000000000000..b6b2fcbbfe75
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.5_rc1-identity.cpp.patch
@@ -0,0 +1,13 @@
+X-Git-Url: http://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=275afcc6dfd3634413ba7fcb65e7f758a22763ad;hp=728cff128564d0ca918daece76312d946ebf6d8f;hb=5ec74a7b8f20e9e3f48cf286e0944f1855a271c3;hpb=d9db3175f4d977a4c809b2981a5a60ee00bb69b4
+
+diff --git a/src/common/identity.cpp b/src/common/identity.cpp
+index 728cff1..275afcc 100644
+--- a/src/common/identity.cpp
++++ b/src/common/identity.cpp
+@@ -315,4 +315,6 @@ QDataStream &operator>>(QDataStream &in, Identity &id) {
+ return in;
+ }
+
++#ifdef HAVE_SSL
+ INIT_SYNCABLE_OBJECT(CertManager)
++#endif // HAVE_SSL
diff --git a/net-irc/quassel/quassel-0.4.1.ebuild b/net-irc/quassel/quassel-0.4.1.ebuild
deleted file mode 100644
index d6617c624d94..000000000000
--- a/net-irc/quassel/quassel-0.4.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.1.ebuild,v 1.1 2009/03/31 16:10:29 patrick Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
-HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="dbus debug kde monolithic +oxygen phonon +server +ssl webkit +X"
-
-LANGS="cs da de fr hu nb_NO ru sl tr"
-for l in ${LANGS}; do
- IUSE="${IUSE} linguas_${l}"
-done
-
-RDEPEND="
- dbus? ( x11-libs/qt-dbus:4 )
- monolithic? (
- dev-db/sqlite[threadsafe]
- x11-libs/qt-sql:4[sqlite]
- x11-libs/qt-script:4
- x11-libs/qt-gui:4
- kde? ( >=kde-base/kdelibs-4.1 )
- phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
- webkit? ( x11-libs/qt-webkit:4 )
- )
- !monolithic? (
- server? (
- dev-db/sqlite[threadsafe]
- x11-libs/qt-sql:4[sqlite]
- x11-libs/qt-script:4
- )
- X? (
- x11-libs/qt-gui:4
- kde? ( >=kde-base/kdelibs-4.1 )
- phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
- webkit? ( x11-libs/qt-webkit:4 )
- )
- )
- ssl? ( x11-libs/qt-core:4[ssl] )
- "
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-pkg_setup() {
- if ! use monolithic && ! use server && ! use X ; then
- eerror "You have to build at least one of the monolithic client (USE=monolithic),"
- eerror "the quasselclient (USE=X) or the quasselcore (USE=server)."
- die "monolithic, server and X flag unset."
- fi
-}
-
-src_configure() {
- local MY_LANGUAGES=""
- for i in ${LINGUAS}; do
- MY_LANGUAGES="${i},${MY_LANGUAGES}"
- done
-
- local mycmakeargs="
- $(cmake-utils_use_want X QTCLIENT)
- $(cmake-utils_use_want server CORE)
- $(cmake-utils_use_want monolithic MONO)
- $(cmake-utils_use_with webkit WEBKIT)
- $(cmake-utils_use_with phonon PHONON)
- $(cmake-utils_use_with kde KDE)
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use_with ssl OPENSSL)
- $(cmake-utils_use_with oxygen OXYGEN)
- -DEMBED_DATA=OFF
- -DLINGUAS=${MY_LANGUAGES}
- "
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed"
- newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
-
- insinto /usr/share/doc/${PF}
- doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
- fi
-}
-
-pkg_postinst() {
- if use server ; then
- ewarn
- ewarn "In order to use the quassel init script you must set the"
- ewarn "QUASSEL_USER variable in ${ROOT%/}/etc/conf.d/quasselcore to your username."
- ewarn "Note: This is the user who runs the quasselcore and is independent"
- ewarn "from the users you set up in the quasselclient."
- elog
- elog "Adding more than one user or changing username/password is not"
- elog "possible via the quasselclient yet. If you need to do these things"
- elog "you have to use the manageusers.py script, which has been installed in"
- elog "${ROOT%/}/usr/share/doc/${PF}".
- elog "http://bugs.quassel-irc.org/wiki/quassel-irc/Manage_core_users provides"
- elog "some information on using the script."
- elog "To be sure nothing bad will happen you need to stop the quasselcore"
- elog "before adding more users."
- fi
-
- if ( use server || use monolithic ) && use ssl ; then
- elog
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
- fi
-}
diff --git a/net-irc/quassel/quassel-0.5_rc1.ebuild b/net-irc/quassel/quassel-0.5_rc1.ebuild
index 464a3a2815b0..9ea805b11d56 100644
--- a/net-irc/quassel/quassel-0.5_rc1.ebuild
+++ b/net-irc/quassel/quassel-0.5_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5_rc1.ebuild,v 1.1 2009/08/26 18:06:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5_rc1.ebuild,v 1.2 2009/09/04 20:06:38 billie Exp $
EAPI="2"
@@ -62,6 +62,10 @@ pkg_setup() {
fi
}
+src_prepare() {
+ epatch "$FILESDIR/${P}-identity.cpp.patch"
+}
+
src_configure() {
local my_langs
for i in ${LINGUAS}; do