Bump for #541280

Package-Manager: portage-2.2.17/cvs/Linux x86_64

3 files changed, 208 insertions, 24 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 1bf1a9571fc6..26ad79b7e21b 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.190 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.191 2015/02/25 03:09:58 patrick Exp $
+
+*quassel-0.12_beta1 (25 Feb 2015)
+
+  25 Feb 2015; Patrick Lauer <patrick@gentoo.org> +quassel-0.12_beta1.ebuild:
+  Bump for #541280
 
   22 Feb 2015; Michał Górny <mgorny@gentoo.org> quassel-0.10.0-r1.ebuild,
   quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild,
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 279784e51553..b1975954673b 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX missing-bsd-includes.patch 1138 SHA256 0e63c51f5816c266b027c88952d4901d25ba250b1934bbb2e966727ac76b6537 SHA512 8e4f32af8ccc57b053bd6133e3a37944605fe4d17879bf151afe1d6d9102c89747a20b63c00ff683573f2df6a41684d49463d3ef69b57f23eb1d1295bfbdd34e WHIRLPOOL ff53c5418e4fd276881c6ed3bb5abb6554e13fd7f7f814cbe98b66477f02651350103cd225f7078ad42280dd7d0672493eb6574806e4c0cf661206a623705d4a
 AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
 AUX quasselcore.conf 721 SHA256 fc6960a3b17f00eec09530b1ba797056abd2cde0900dce4bd3aeb06c535c6fc8 SHA512 15abd15f7008d58771dd37d59de0121b8920070596ca9f1bca73d84052f4ac1629b1ee0eb9da303bfff02ad4130e6ded27c0f316a0a0e5209987d9c62f155b9d WHIRLPOOL f28abb1ddf48cd260820e42081e5c6eb8ffb9cc580e43ab3a68b6248fe1c83102e08e2a34c876d2aca5c405b6b46182cf3934684f7627c50ab89671c88a52a97
@@ -9,32 +6,15 @@ AUX quasselcore.service 189 SHA256 33c71f621f69f2eb6a5c613b979238c085a1e1aef3ee1
 DIST quassel-0.10.0.tar.bz2 2873233 SHA256 68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23 SHA512 e194d4f9bbcecedfebd72c48d5f1e2a4185ff9d69134629b79e532af8f3fa9841e3cb99a6aae30e9bd79440c08487eeb23d6d6914690b90d1ae0952bb6168693 WHIRLPOOL bedd3de56e7625219a2970842ff0b073abbdc3488c8efece112c92f277386d5a3b63bde100a6e3daf2d5c0011e515e9fef81b888feec58d2a6571b4f898e8578
 DIST quassel-0.10.1.tar.bz2 2872973 SHA256 0d17b7d2284d9ef29ba4dad515ec84ce41a560237b3c8e7505d0ef028e95df80 SHA512 2d94b2ebf54101393356f378fd6a4fd68b24155a3ed52b7a36e47149d89d43b884a98d712c6212f4ea1bed151a9a713de63449c793f7d3e5e09e8bb595ff14f3 WHIRLPOOL 05db2c91ff4aeeccf12a68ac655efc24f4d698e4da60d36bb8580955d9b9fcc98f7e400e058cd2f42e2ad6596a214255a30250e9da8cf89881576aac83e03a6d
 DIST quassel-0.11.0.tar.bz2 2875387 SHA256 99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504 SHA512 51450559df2c0fee9a54b76a9342edb9a3b834f1f58edc556e0c1bf1f9366c846d95e7953e1b48c6ecf67ea4255b3574ed3ce537962eec222c5c03ab02852c1d WHIRLPOOL c2ffb7e052a5d412aec5d1b8bacc8cdb8144c20d62d699ca1d8972fd5e8fe6ce89da49251a02c22008061b344d9408b3f018b3b39623703b4d980c289cd5613a
+DIST quassel-0.12-beta1.tar.bz2 3626759 SHA256 9bdedea4b334d7d9a4b79acde42ed80f16a077300346a310bd7d74873d7c8599 SHA512 e56a000a56a70079e4eb3b3e16a174a06b8626ddc4d685006781d397006d5e20dc8ac41da3e2fcdef3bb243471a6b09b8e144560c7e4ab7e51cdb9ec9d414f8e WHIRLPOOL cccf1551e295ff14dd1d8461abdaf832be35a87996a55fb462e45f622d4dd8811a7bbd9cfee72f1fa29d244a00f57b7e4d87db554085f763b7290b22be0bfced
 DIST quassel-0.9.2.tar.bz2 2782855 SHA256 f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0 SHA512 81e343b9b7df7473c9d899df9ad8c4baa779545ac4fe15c3b7d47f3e9473d24aa78c8cfc1833b79ec5b4b3173e8d83e22394a50b7184f348b3f1155bb3724f3d WHIRLPOOL 0b5b45c1bb400f5e2728d5e74f35bc5ef010c029c242940b83c4e6ec3a0c0d16d0c9d9848278d075a548e4e15736f142cc99d4741b8e4901d6589b7f7e05996f
 DIST quassel-0.9.3.tar.bz2 2783132 SHA256 ec29df5c55a02f91d15fa23618b42fc82b0bb912594420cc6340a40567ea3d4d SHA512 f200c23fe0e0459dfc116dcd194184a8be28e65d8116859925c1887c6cff290316a704ca3666c0a5b65ed93e2a6a65aed890babb466fe3996bf9c0e08f988e98 WHIRLPOOL fd9b3bd2241845de69e907d2fc3d895054289c271584b07c99b3032effda44183cd2ba3f0d4b1590e93a72a3735ecca6a1d53c1ccd0a3fc32fc6dc5ec5b2281a
 EBUILD quassel-0.10.0-r1.ebuild 4994 SHA256 b20c3c0a51e489c538781c0d3020868c13f5f8ec1104c6e318c10a5d47b64f84 SHA512 12bcde0120b0835578644e72f4053040f9a4a63c877921733bcb250d57a8416506e85bc7b51f3a28d4a9a8871f2763d2f41fc2b4af9ee66bc8a49e20d44cf38b WHIRLPOOL dfb7c50e1e93a942161f523b85af3bc57bdfe50a5489600f98d5bfbba00720fdeb472ed96de7d305cfe512e09cd345949ed056311df62faf872630ee51ff0eca
 EBUILD quassel-0.10.1.ebuild 4992 SHA256 745fb12a19a2411205bbedd6467650fc2eba4c88ca9e38989e4e2c49805b32d6 SHA512 10fb8dcbb1d6904921b553c42b9208e781493c98e0d352eb2767ba11048220cf7c2298d976f78d6cf64ac57e15f94dd5bb7a910d585ee8f6f8c8247c493ea2ef WHIRLPOOL d1249dcb052278fdc1bbd607d6862186a74247499be001f70d8a7ba925031ce2e9dcb75ab2352c05fa7d960d6209c6abeafc23266b1c0b8ee7b787723dddfc75
 EBUILD quassel-0.11.0.ebuild 5621 SHA256 6bc36f01160007c3411ab3b903213672f8319d893b97e6f42983a0fcb24b2def SHA512 7993183acef66aa5fb9fb117da4643e70a9fdd78344023a25d65074e662e103f4372e54975a81a92628ca6c865de511c85cbc9e7f5596fe8a424b37634be20d4 WHIRLPOOL 1b187e13784805c2af85277482a1b5dae27a7be632f67224781b609f2179f0528bd7e94d3bc5bdd0a8148349f683cfbdfe062becdee43efc16974c2a471fd295
+EBUILD quassel-0.12_beta1.ebuild 5577 SHA256 567bb0a5741f2196455a648311affa0428fa19d50e90292d2f8ba444bc2e9944 SHA512 0c18484d22df0d9265d1f38b133690831fb86aa886302da4fac8ac8d730d5789f7abda5adbefb38e2d2083b2d7f9aeed018566ee14edc31f7423eeb963e51afc WHIRLPOOL 4ced16feccc56145cbdd80f7191675d29e514cb932a6636c5014908a913542a7005f0431bcbd30deb4cdcae49329044423d8fa1ce6c36c81b553d26ccbf07d4a
 EBUILD quassel-0.9.2.ebuild 5216 SHA256 47bc6b669c17f03119dbbbb19be0e60bb256c2048e9749763c6cacd0e93919ea SHA512 c6c8945a15ee6d6dbc9a4bff2d729d33c39663c067ee19a79c3e8eb8de12c982805614464b961429985610b75049e9c4e975e8207a256957aeb493cd2f033f18 WHIRLPOOL 8143fb89d51531d2704513e2fa07ac7775101c71a2591e056157bd85b3cb4f8f38ecc3149938403a3c27dd422e796c042ad89ab6669d5dbf748cbc61762fb19c
 EBUILD quassel-0.9.3.ebuild 5122 SHA256 27e9695a431a476a9a922069237c9f396586c458e16026607365dd79dcb3e545 SHA512 358540b9daa8bf5b72a8d13f107f9e35d73b0c931d9958c43f0677925d6ca194e3186dfec2a8dc0807371d37341b78df4424756c8c54dc63dd2abde59bfa30ff WHIRLPOOL 129f99548c1fa7916f67457d21848da920534dc2e63bc554b09e35b8dbd71302aafb0f90e5ebe78246106fceb919f3cf73b6dacee53aa13928721e335eefc22c
 EBUILD quassel-9999.ebuild 5949 SHA256 1be872f9e03a6ee270716857ee97c17c0fa36d990269fe44652a9570e20e8e9b SHA512 6138c310954f5ace10270296eced8b882c3191b386b99c0b21a7603d835a8655c9299d33b923befafa59bfc9abafd804eeede8c4170c3cdab8a98227176733ef WHIRLPOOL fc73c334975331bf70aebc0e981db80ee642161d6a772506aca713cbee05a15849e2b2b9bf8fa4d6a72c5874d683d4858716e5a32f0eb22d1af01506064853bd
-MISC ChangeLog 29908 SHA256 3b2c42f91ae65dc20ae3beb079d2bfe83233cf70b22477c74037829d5c045545 SHA512 8491fe68fbf164d3bd45f1f56087c6b5eaee4f08651ed9704472b5808f8cc764a9fe5391975e482f8fbadfc57cf0e0a1bdc2e14e48e5d45722cb985e6de93130 WHIRLPOOL f926632696dbb4684856c21645c9d3cdc394311bf1ade60340b0baf5a71d37f5c63d052982564667ab4f360f477122b049c3882f4483733ad52a56677b6365ab
+MISC ChangeLog 30042 SHA256 0bf4c696c715917b4faa353e86ae7f7aa4419c591430b74d19fe9bc51021f3cd SHA512 1a307fbd81f099d9d46374f8a5169ec375d7b12861e27d73bd9641b143ff20631ccccb15d10b2bc5bdf5e811ed62c882369dab663d648cc9931256bc81742562 WHIRLPOOL 66ec5f4836d173ecc66e07bc5cda92c1ed0fd16dfa9fdeb20474b7c6fccd38af616fe3f6d0be23780f781bac7409eef4568c36c842582c88851efe79985a8cf3
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOewMQANG8P8wpeW73woKv27EDnDvG
-XklidI5toGPjANjZVX9wiPq32bEF4wR+zcitvYJsLfr4xNjiC80QQtJStST29SCM
-GBShB6ix/eIgPLBunjzFV/HHYWHRl99ZSgCo/EUsU8neFH5CKISM1mXVVOp0yNNq
-4Kw7zQukAK2P8xkAktWsgW/6bxkenhIUD1N5Vh0Dq16c6BHiDbFdjkRjDwqq3e74
-hyQHFnQS3/jgJEYbwGKugAIMD9BZW4p0OG8wHcWGIL8bdhbA1y6OS1wnzH7cg/C0
-uMJdHoc07yAHv0CmYbRW+Mz+m3a7pqrU+KfeQZBJ8lfDaVgfBiBL3ydOEE18G1/g
-RCGaJmUFOPhAAj57Oyq/KymbfRcgJ76Kyb4nUGGc7T+lmi8GYb2iRkjBzt6/9Why
-QxG5rSBunFnQO95UR3L7sy2uGGgY3PLibzgl4rYkII8UJDXrWHu/oTWrmLvK15Pz
-hpIDd/hlRkWhx90ial8jw0FYgUNsbi6eoqwnDLkjfFKHsAB2RIu+tb3BZjV3hsUu
-0513Z6cvWvDbEOw0R8jfcDPSnq/wu+3bLDb+hsj+M95TWldd4ycS0C/mx25Zh3DA
-CP8wihxRhLtonMvpgUm9mUN5ey10zBibMEm/BQMT3cKsKZsvkqIrao3zlV6AM7Br
-MfpezjnywmCKRn6eNVfh
-=2Wmb
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.12_beta1.ebuild b/net-irc/quassel/quassel-0.12_beta1.ebuild
new file mode 100644
index 000000000000..1d99e2c1fdee
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12_beta1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.12_beta1.ebuild,v 1.1 2015/02/25 03:09:58 patrick Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils pax-utils systemd user versionator
+
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS=""
+SLOT="0"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+	qt5? (
+		dev-qt/qtscript:5
+		postgres? ( dev-qt/qtsql:5[postgres] )
+		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	!qt5? (
+		dev-qt/qtscript:4
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
+		postgres? ( dev-qt/qtsql:4[postgres] )
+		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt5]
+			dev-qt/qtdbus:5
+		)
+		phonon? ( media-libs/phonon[qt5] )
+		webkit? ( dev-qt/qtwebkit:5 )
+	)
+	!qt5? (
+		dev-qt/qtgui:4
+		ayatana? ( dev-libs/libindicate-qt )
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt4(+)]
+			dev-qt/qtdbus:4
+			kde? (
+				kde-base/kdelibs:4
+				|| ( kde-apps/oxygen-icons kde-base/oxygen-icons:4 )
+				ayatana? ( kde-misc/plasma-widget-message-indicator )
+			)
+		)
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
+		webkit? ( dev-qt/qtwebkit:4 )
+	)
+"
+
+RDEPEND="
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl?]
+	)
+	!qt5? ( dev-qt/qtcore:4[ssl?] )
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S="${WORKDIR}/${P/_/-}"
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	ayatana? ( || ( X monolithic ) )
+	crypt? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
+	kde? ( phonon || ( X monolithic ) )
+	phonon? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	qt5? ( !ayatana !crypt !kde phonon )
+	syslog? ( || ( server monolithic ) )
+	webkit? ( || ( X monolithic ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ayatana IndicateQt)
+		$(cmake-utils_use_find_package crypt QCA2)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_with kde)
+		$(cmake-utils_use_with !kde OXYGEN)
+		$(cmake-utils_use_want monolithic MONO)
+		$(cmake-utils_use_find_package phonon)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_with webkit)
+		$(cmake-utils_use_want X QTCLIENT)
+		"-DEMBED_DATA=OFF"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		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
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
+	# temporary info mesage
+	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
+		echo
+		ewarn "Please note that all configuration moved from"
+		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
+		ewarn "to: ${QUASSEL_DIR}."
+		echo
+		ewarn "For migration, stop the core, move quasselcore files (pretty much"
+		ewarn "everything apart from quasselclient.conf and settings.qss) into"
+		ewarn "new location and then start server again."
+	fi
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}