Add systemd unit file to live ebuild as well, bug #508450. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 24 insertions, 184 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index c55bb218f91e..44d1e10d152e 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.169 2014/05/02 10:28:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.170 2014/05/03 18:39:28 johu Exp $
+
+  03 May 2014; Johannes Huber <johu@gentoo.org> -quassel-0.10.0.ebuild,
+  quassel-9999.ebuild:
+  Add systemd unit file to live ebuild as well, bug #508450. Remove old.
 
 *quassel-0.10.0-r1 (02 May 2014)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f238548894a7..48fb4e32c0db 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -10,16 +10,25 @@ DIST quassel-0.10.0.tar.bz2 2873233 SHA256 68228ce23aa3a992add3d00cb1e8b4863d8ca
 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 4953 SHA256 ef80b9998862bf46dcf09a8bf8b6baf5f67b1e3ef637428f60a06286194d660d SHA512 4316a5643f2fbd5db0753574191b61b8fa9c0a260a63620767add1049fe2babcbd238b3e2703fe664eef62d91e8cf3e4e68e69277b6e936a04b66d951c9e7951 WHIRLPOOL 680eb97d0d2570e325578bc9f40aa71076a54cfe0d183d3062f9f0afb8085bd2f1add9e29a783fd727d7e5b58caabbe3ffb18ab93f61e493d0f923f7de3fbe9b
-EBUILD quassel-0.10.0.ebuild 4875 SHA256 64802847bcfc0fa82191968329ec39863753bbadabdb229ca21068611e114c2c SHA512 91609edc9651b051f05d81e402bc48a10c3e0c574b2faf3eca99b5e2885520795cab04d5519b28daca2d34801f3d09f5d658fa58793ca6a082dff306625f9712 WHIRLPOOL 6a0b8e1c543a9f2dda1aca46d04b66db3c367f304636b4afb89d50af62c3b09dbf28fed5feef0deece1c2b1ee1be361b288c95090f64e109f2217bf8e2614c5c
 EBUILD quassel-0.9.2.ebuild 5189 SHA256 5f481c1a55a2668a4e8563642690595c54dfe1396f3e1e940cb2cc7a4e51fe80 SHA512 3e41120abdff8f9b744fd635723d004906f8705185509400d9ca14316da223554931617a8e4e773d0721994e3b0c10d0cf7d11083d7c06a4f1370b179aa263b3 WHIRLPOOL 9ff88ad81df39a82755185f73980a44fc6188d3567241d9f7662a9e43cc0897e334a34c89ca69c18c5e7c98eb8315527239d447360dd8a2d0340d0b70518c9d0
 EBUILD quassel-0.9.3.ebuild 5098 SHA256 32ea0d0846280e1b58b4dafe6a334db3dbdf6cba7a352259659be3df08b7e6ea SHA512 050f11b4691c6638c3f06d318f55dafaf5d6e06f756d4f5c108e7948e1375544ca5505de30230b5bb6d735e2f0f9fa79b33ecbad82ac526129cc0a17c6508948 WHIRLPOOL b869e318d97ff38bbc106e3f20e7645c0620de853a8ba4c3f455bef84089c9cc93de9ebc2ad00ba13eaeb00c2d8b033111a981913c347a647ee003ea13a22ec1
-EBUILD quassel-9999.ebuild 4825 SHA256 8fb9d61388c9e7b6ce307c542658d9e309d7089bcbe895819e500a579f07eeaa SHA512 7bbeebe214eb3ade7105ff09d296b156c6ea9a60990aa8fb7e8c19a6be641fb8dac49df250dc11e01ef8ca40de4f1641f8b19e7d856dfe946456c8b0fd7954aa WHIRLPOOL aba17c79acac309e422b78b36f600ac5f052e4e87d5e9ff59c532fabb52d6fc205663acec95e9b8db8e56811bbd3650174de303a28f9ada42f70b5be815f2abf
-MISC ChangeLog 26788 SHA256 1f8fd779c682e6f52a54604a8dcb7fc68b5025c28afa0dac9f9037dee92e6073 SHA512 4a1366a96aa286b7a0ef869c205f8ce09ce1eafad6d4e8a8cf4286728f94b0dda2c842cf78419bd27d8f4ef1080c384e5f436b3223db4fe8dcf8f1dacadb65a5 WHIRLPOOL 96dff030d5a2b00df9037a02fab197b8a8613ae1e5a9ce9bc61614802a23c928ab51e145c0ab6bc9b842c2097d3e6107f868001bed0e0c3b7bbb0ad85b39a7d0
+EBUILD quassel-9999.ebuild 4899 SHA256 64067d1ec6c9897e78119a63db845c7b02edf3b15d2bcdd8539b4e5454ab1175 SHA512 2e0fdc714eb6af19cbf7296b3270d4391772306ada15d951e5e6ca1b3aade1dfc6dcc091f36206287492d35caa57c91c15f3b422bb0945db35cc63bece69f20d WHIRLPOOL 84dfe996582fcfc3fd55cb8afdbdf162c1b1029b584860bff5a68203ffe4157f62558e59f4970f9e480d20fd9140af31d85f1e6e5202f9c0e23a6861e0f8e861
+MISC ChangeLog 26956 SHA256 a3f5275261b56856dbdb46ec935dd9ed156d6898ca791e78e50bba2f7b0948c1 SHA512 af8c58111751883eeee45c3dcaacc36d5a5c0fe3fee5f64657a570ee70dc1c207237101e1367ad406a9cafcf71b694e76d7805f6961165e61bbe9b14c8ce324f WHIRLPOOL fe65cf422963031eeaf6c2e6a4c3af27dddd2b389acbd58d288f5f6bb04c49cd4291456c5ca36cecffe078b823dcbf10806e7ca5379e8aee37179741e8f9df46
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNjc1MACgkQCaWpQKGI+9RY1QCeLD7W+AY8t/5iuvzjfhkrdNEu
-YVgAnjmeDo0+Xt0rfgHBWxCdufGypctY
-=CJEP
+iQIcBAEBCAAGBQJTZTfqAAoJEGVpnaTzz9K9QHUQAK76dhNcPnNwcIjpB1MtuOyz
+YQDXSI1gg7m9VlvoUT7gDRsnAppvXzblEs7Ou5XAIBeZF/3xd+bGcVPpt0BF1mlR
+ZMmAAtNCZi+9LXHDxGJy2tnRcUD8xHNpS0xKmlEBRHIfnuovV8JynGvI/ejptppn
+w1yVZUgcNOPjWU/kW8sgxU/6c03B50/kEPuW+569GZ0Ihziz+msN5qndN+WZsLGd
+yJZhgJAn8CdxWmFF4aeAzUTZcDqw7S6ubNMc5qp+e9TfeuHsW2tu2bbFZIqS5O+P
+jrqDV5twTC2K3c+tsuKdG1QwgLCEi0O3cZvP6MGHOa0A5J3z4fMuQMqgBLn8GCEA
+pSAM1EP0Ksy6UOoBc46ZAN4ioGfOHqYxD+/JjNOBFXFc6NTSD+hTL0/tSyeUoGJK
+UKZKXIMumL9PKm9+mDSNDT5hKCbqkpJ6nBNpssM09AsfK4zs2uokHMSqByEmp6Ij
+lA/z8hb6ITt4X+qdhzQCqUk/SXKWBQKUgtofZWQCHEFS+dw2q2ZIyBk86N6AyiU1
+5Ijrn3I851nkBgqxA9baOuXP54sEhjOxNg2q9Yga03Eu7FSkDGA9nYSqtoEvKh/w
+wRvDTEtM35EP6qtLYBdVimubJko0jBuNyEMZ+MPP1h2ILUjOZefqUQUQ2UX4BFxT
+C5Cj5Gx3lVukbPhxvba4
+=JlqE
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.10.0.ebuild b/net-irc/quassel/quassel-0.10.0.ebuild
deleted file mode 100644
index 8d423cf03c0b..000000000000
--- a/net-irc/quassel/quassel-0.10.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0.ebuild,v 1.1 2014/04/01 23:08:36 johu Exp $
-
-EAPI=5
-
-inherit cmake-utils eutils pax-utils 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="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
-	)
-	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	postgres? ( dev-qt/qtsql:4[postgres] )
-	syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-	dev-qt/qtgui:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		dev-qt/qtdbus:4
-		dev-libs/libdbusmenu-qt
-	)
-	kde? (
-		kde-base/kdelibs:4
-		kde-base/oxygen-icons:4
-		ayatana? ( kde-misc/plasma-widget-message-indicator )
-	)
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-
-RDEPEND="
-	dev-qt/qtcore:4[ssl?]
-	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
-	)
-	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
-	)
-	"
-DEPEND="${RDEPEND}
-	kde? ( dev-util/automoc )"
-
-DOCS="AUTHORS ChangeLog README"
-
-S="${WORKDIR}/${P/_/-}"
-
-REQUIRED_USE="
-	|| ( X server monolithic )
-	crypt? ( || ( server monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	syslog? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) )
-	phonon? ( || ( X monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	ayatana? ( || ( X 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_with ayatana LIBINDICATE)
-		$(cmake-utils_use_want X QTCLIENT)
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_with webkit)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with syslog)
-		$(cmake-utils_use_with !kde OXYGEN)
-		$(cmake-utils_use_with crypt)
-		"-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
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
-
-		# 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
-}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4d3b7d33b406..08b07c73171c 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.70 2014/04/01 23:08:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.71 2014/05/03 18:39:28 johu Exp $
 
 EAPI=5
 
-inherit cmake-utils eutils pax-utils user versionator
+inherit cmake-utils eutils pax-utils systemd user versionator
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -116,9 +116,10 @@ src_install() {
 		keepdir "${QUASSEL_DIR}"
 		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
-		# init scripts
+		# init scripts & systemd unit
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
 		insinto /etc/logrotate.d