3 files changed, 204 insertions, 15 deletions
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 11ae89262ff8..805e19de8ee1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -5,6 +5,7 @@ AUX quasselcore.init 1744 BLAKE2B 6d79a5889f11bfb870192078675938c259d8face81c9dd
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
+EBUILD quassel-0.12.4-r1.ebuild 4896 BLAKE2B c85bafef6e7893295d2338d9d9bc36d7e1bf52bb03d6ae9b6fff70ce6e43b7c1dd2053c87933056c3f49fc2b1cb9e3f9c328929017977f12db77c8b31cb2a411 SHA512 784654af53e00e7845d6213228a1f37c6ec9322decd1160f24d491ab2e54bae013e3274641cbe31eb4cf85b71939fd46e5b59d01677270a33ba967a01adf5acc
 EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
-EBUILD quassel-9999.ebuild 4776 BLAKE2B d746973a5f52ef9a8575af1531c89a455ef9fa1453637f7ea13916369f6464422fdc9105ed32948ee362af8bc6d252f797189332afae3a7da70b2e08b6472a71 SHA512 cef831488a2332453455821593867efcfe341464a8a971408815c1af7c374f01bd31eb52a9e9baf6a3ce0215b51962f0e0ae4dcaa1a598ccaaeb73566ba8e773
+EBUILD quassel-9999.ebuild 4911 BLAKE2B b71e42a3edac3fdf46d5fdfe38e2253ba8bde4ab9b4b8ed7d8fb06b3451824ac9d9eb1f16520b2354d35ec0b4bf8012597338f89aad46ad8efd2577213f5375f SHA512 3dcc2a9c74b23c24e76de3ae9cd876f5b1591af8faac6bd1ec6b7707b1d106dfdbaeeefd03a0d6cc52ad213c7a766b82f599dc35be2c136b8874ee67e48f3768
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild b/net-irc/quassel/quassel-0.12.4-r1.ebuild
new file mode 100644
index 000000000000..a2f11472cf41
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+[[ "${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="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		dev-qt/qtdbus:5
+	)
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+		kde-frameworks/sonnet:5
+	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus phonon )
+	phonon? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	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=(
+		-DUSE_QT5=ON
+		-DEMBED_DATA=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_OXYGEN=$(usex !kde)
+		-DWANT_MONO=$(usex monolithic)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		-DWANT_CORE=$(usex server)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBKIT=$(usex webkit)
+		-DWANT_QTCLIENT=$(usex X)
+	)
+
+	# Something broke upstream detection since Qt 5.5
+	if use ssl ; then
+		mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+	fi
+
+	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-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 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/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	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
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
+
+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
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index bf4fa999424a..1f9e3e14eea2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils systemd user
+inherit cmake-utils gnome2-utils pax-utils systemd user
 
 EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -13,9 +13,10 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-SLOT="0"
 KEYWORDS=""
-IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
+SLOT="0"
+IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
@@ -73,7 +74,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus )
 	ldap? ( || ( server monolithic ) )
 	monolithic? ( || ( breeze oxygen ) )
 	postgres? ( || ( server monolithic ) )
@@ -96,21 +97,22 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT4=OFF
 		-DUSE_QT5=ON
-		-DWANT_CORE=$(usex server)
-		-DWANT_MONO=$(usex monolithic)
-		-DWANT_QTCLIENT=$(usex X)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_LDAP=$(usex ldap)
-		-DWITH_WEBKIT=OFF
-		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWITH_BREEZE=OFF
+		-DWITH_WEBKIT=OFF
 		-DWITH_BREEZE_DARK=OFF
 		-DWITH_OXYGEN=OFF
 		-DEMBED_DATA=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
+		-DWANT_MONO=$(usex monolithic)
+		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWANT_QTCLIENT=$(usex X)
 	)
 
 	cmake-utils_src_configure
@@ -128,8 +130,8 @@ src_install() {
 		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
 		# init scripts & systemd unit
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
 		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
@@ -153,6 +155,12 @@ pkg_postinst() {
 		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
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
 
 pkg_config() {