6 files changed, 18 insertions, 273 deletions
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 805e19de8ee1..19e0f9897a80 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,11 +1,8 @@
 AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
-AUX quasselcore.conf 607 BLAKE2B c0a0ecaf2089b19ba57a030bbeeb52f93617a8ed94a4077258fca9356ad5e9c11f708ea4f07e5096eec43c6ece355b6b92897115cf8d1249eae2779b9b952618 SHA512 b1fd0382d83c5983f6266c7500ac12dc00b964ff1f104cb20de9dd40b93edcbf90f98f5ab3f6f2cb87e6be63580c3ab2958f2e3ae57eb9569c24c49d8506bc38
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
-AUX quasselcore.init 1744 BLAKE2B 6d79a5889f11bfb870192078675938c259d8face81c9dd1edfd4ac694bd6659ff3fc8bcab2db83a5d2907690059aa00711eed16e860ec60a8415347fdb0b2675 SHA512 44686e78ebcfd30db2a5cc3661e793c9bf110f54fb2a826e3df1a1575b2f40eea84013218575d71b4b2ab569d6d5e367e2e4b1b2e800e581e73fe5bbed9727f0
 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 4911 BLAKE2B b71e42a3edac3fdf46d5fdfe38e2253ba8bde4ab9b4b8ed7d8fb06b3451824ac9d9eb1f16520b2354d35ec0b4bf8012597338f89aad46ad8efd2577213f5375f SHA512 3dcc2a9c74b23c24e76de3ae9cd876f5b1591af8faac6bd1ec6b7707b1d106dfdbaeeefd03a0d6cc52ad213c7a766b82f599dc35be2c136b8874ee67e48f3768
+DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
+EBUILD quassel-0.12.5.ebuild 4885 BLAKE2B f732d9aea2322f507845cf69321a442c02ff835f24be64974b15f64858a661ac594894e8f2b81d7305469d50523a862fbd08186fc96aa7f2b20301c1ec77e467 SHA512 d59718ca4709c99279f2a0ef8a4786bb32a3b0a4ab57c4f65db13e4518dfd2add6ef9642532313a60c06fc72b9e46e462b791384da2cdacb2e8cc957380daf54
+EBUILD quassel-9999.ebuild 4948 BLAKE2B 5cd29b908fbc1242ebc387c4952d3ff8c267928a119ddbc001939cce6995432c7db858e19f0fb10ddfc34f92b1f40e3032b0574ffaee5129a859f76329471605 SHA512 bb42224e7b8f24cded719f1ab1f036b7ee0d658af0ec8584df1f3a58b52f32e2eb2f7d52a0879914efba3640120f8973a3a9ea7ea27fe50998c863d79b3d32bc
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
deleted file mode 100644
index 960203500fe4..000000000000
--- a/net-irc/quassel/files/quasselcore.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Loglevel Debug|Info|Warning|Error. Default is: Info
-# The logfile is located at /var/log/quassel.log.
-#LOGLEVEL="Info"
-
-# The address(es) quasselcore will listen on. Default is 0.0.0.0
-#LISTEN="0.0.0.0"
-
-# The port quasselcore will listen at. Default is: 4242
-#PORT="4242"
-
-# User we want our daemon to run under.
-#QUASSEL_USER="quassel"
-
-# Directory we store all quasselcore content.
-#CONFIGDIR="/var/lib/quassel"
-
-# File quasselcore will log all its events into.
-#LOGFILE="/var/log/quassel.log"
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
deleted file mode 100644
index 8e66dff8ca32..000000000000
--- a/net-irc/quassel/files/quasselcore.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	after bootmisc postgresql
-}
-
-CORE="$(which quasselcore)"
-PID="/var/run/quassel.pid"
-LOGFILE=${LOGFILE:-"/var/log/quassel.log"}
-CONFIGDIR=${CONFIGDIR:-"/var/lib/quassel"}
-QUASSEL_USER=${QUASSEL_USER:-"quassel"}
-
-checkconfig() {
-	# set defaults
-	LOGLEVEL=${LOGLEVEL:-"Info"}
-
-	# check config folder
-	if [ ! -d "${CONFIGDIR}" ]; then
-		mkdir "${CONFIGDIR}" || return 1
-	fi
-	# permissions always changed just to avoid runtime issues
-	chown -R "${QUASSEL_USER}":"${QUASSEL_USER}" "${CONFIGDIR}" || return 1
-
-	# check log file
-	if [ ! -e "${LOGFILE}" ]; then
-		touch "${LOGFILE}" || return 1
-	fi
-	# permissions always changed just to avoid runtime issues
-	chown "${QUASSEL_USER}":"${QUASSEL_USER}" "${LOGFILE}" || return 1
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Quassel Core"
-
-	if [ -n "${RC_UNAME}" ]; then
-		# running on baselayout-2/openrc
-		start-stop-daemon --start --user "${QUASSEL_USER}" --background --make-pidfile \
-		--pidfile "${PID}" \
-		--exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
-		${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
-		--configdir="${CONFIGDIR}"
-	else
-		# running on baselayout-1
-		start-stop-daemon --start --chuid "${QUASSEL_USER}" --background --make-pidfile \
-		--pidfile "${PID}" --env HOME="${CONFIGDIR}" \
-		--exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
-		${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
-		--configdir="${CONFIGDIR}"
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Quassel Core"
-	start-stop-daemon --stop --pidfile "${PID}" --exec "${CORE}"
-	eend $?
-}
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
deleted file mode 100644
index fea12b014b0b..000000000000
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils 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 ) 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=(
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_OXYGEN=$(usex !kde)
-		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		-DUSE_QT5=ON
-		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-		-DWITH_WEBKIT=$(usex webkit)
-		-DWANT_QTCLIENT=$(usex X)
-		-DEMBED_DATA=OFF
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# 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 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
-}
-
-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-0.12.4-r1.ebuild b/net-irc/quassel/quassel-0.12.5.ebuild
index a2f11472cf41..6f3dde9b18d0 100644
--- a/net-irc/quassel/quassel-0.12.4-r1.ebuild
+++ b/net-irc/quassel/quassel-0.12.5.ebuild
@@ -5,15 +5,17 @@ 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
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+	inherit git-r3
+fi
 
 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"
@@ -66,7 +68,7 @@ DEPEND="${RDEPEND}
 	kde-frameworks/extra-cmake-modules
 "
 
-DOCS=( AUTHORS ChangeLog README )
+DOCS=( AUTHORS ChangeLog README.md )
 
 REQUIRED_USE="
 	|| ( X server monolithic )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 1f9e3e14eea2..1c3e58249a79 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -5,15 +5,17 @@ EAPI=6
 
 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
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+	inherit git-r3
+fi
 
 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="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
 snorenotify +ssl syslog urlpreview X"