Bump, remove old

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

5 files changed, 17 insertions, 225 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 6c0f53f4aeec..2b538662f410 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.203 2015/04/22 08:36:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.204 2015/04/24 03:23:46 patrick Exp $
+
+*quassel-0.11.1 (24 Apr 2015)
+*quassel-0.12.2 (24 Apr 2015)
+
+  24 Apr 2015; Patrick Lauer <patrick@gentoo.org> +quassel-0.11.1.ebuild,
+  +quassel-0.12.2.ebuild, -quassel-0.11.0-r1.ebuild, -quassel-0.12.0.ebuild,
+  -quassel-0.12.1.ebuild:
+  Bump, remove old
 
   22 Apr 2015; Patrick Lauer <patrick@gentoo.org> quassel-0.12.0.ebuild,
   quassel-0.12.1.ebuild, quassel-9999.ebuild:
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f79fd1a364f0..35cc5eaf6b44 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,13 +4,11 @@ AUX quasselcore.conf 721 SHA256 fc6960a3b17f00eec09530b1ba797056abd2cde0900dce4b
 AUX quasselcore.init 1857 SHA256 af041a6c800ffb443d008b861c639bf32580b3655f7db3bc00db833374af6b2e SHA512 0405af90fe65589e163d6b2470ea4d4d3b8dad49ee3b89caba9bcffd7186bd92f204da4f8404e5ed489a949fc89b898f0b94c94c8382f90f89ccda5e2b8e2382 WHIRLPOOL 7fefa3e977f5edce047c8f928e52b3dfc702a151930a92365be7d9eb0e88adffa924164e080bf8170dfb4a95c357cb9b059394d3854464f93d58f577ecea41de
 AUX quasselcore.service 189 SHA256 33c71f621f69f2eb6a5c613b979238c085a1e1aef3ee162011341c1a26821dae SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776 WHIRLPOOL 97e88e0581d064305390a7e093bc550f1fcad9a782ca7d7bae941aa56d9f6fbd72a98d67c0d85b3cf6f17d282ddc76e4c61ddc83a2ee14079b4643f8b29cb5fd
 DIST quassel-0.10.0.tar.bz2 2873233 SHA256 68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23 SHA512 e194d4f9bbcecedfebd72c48d5f1e2a4185ff9d69134629b79e532af8f3fa9841e3cb99a6aae30e9bd79440c08487eeb23d6d6914690b90d1ae0952bb6168693 WHIRLPOOL bedd3de56e7625219a2970842ff0b073abbdc3488c8efece112c92f277386d5a3b63bde100a6e3daf2d5c0011e515e9fef81b888feec58d2a6571b4f898e8578
-DIST quassel-0.11.0.tar.bz2 2875387 SHA256 99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504 SHA512 51450559df2c0fee9a54b76a9342edb9a3b834f1f58edc556e0c1bf1f9366c846d95e7953e1b48c6ecf67ea4255b3574ed3ce537962eec222c5c03ab02852c1d WHIRLPOOL c2ffb7e052a5d412aec5d1b8bacc8cdb8144c20d62d699ca1d8972fd5e8fe6ce89da49251a02c22008061b344d9408b3f018b3b39623703b4d980c289cd5613a
-DIST quassel-0.12.0.tar.bz2 3682159 SHA256 1429929c3fdea860131e13c4e185f747e86cddb99d6e714940c1f8100020e127 SHA512 dc334fb80f6b58517bf379b1ac34f91c8b3350f7c38f748fa43c4b660d286ffc1d0e1e046bb54cefdda75b33481f557820c383af40d5b28e00780f42b115a0a8 WHIRLPOOL f8b7be270d0a92a668d06b8192389f680c0bbb606d8d3567147c576831d8d15225219f0765c7db18e3a60843e8a091e8fde9b495c55551e3aa46615e7ccf9b90
-DIST quassel-0.12.1.tar.bz2 3682223 SHA256 28da5fbe10cd303e95703f0c2498e5da9ace896cc954ddd709776614d855c8f9 SHA512 ecf39f3666ca55770be53b1a43c5a2ecbb6db3b581e121bbb13088cc2f9dc85cdf8ab1c27011bc394b9d81ac37c0da1f2fabea102c85118f1107ae5471375b53 WHIRLPOOL eb7604337596701f666adf0495dd9b8df2c89a02ab3f9a17336bf8aa03572afd9c49f94824dedba71c176c1285904dd1efde1d85780b31e41f75343677b9189c
+DIST quassel-0.11.1.tar.bz2 2877325 SHA256 ad60aeb937e2cb5dc2b510daf46940e0bcf27efb4a20b80c776174109aa7566e SHA512 76049ee5bc7c1c53e5b2162c0d7691980230b5a756775335a2c56bf4561d1dea762db00be5c760cdf3858f90cd95edecefcf44d9fa9a39c12f70b7c6eb34e957 WHIRLPOOL 4c56a6b560807dd0336ef244dfec0bb00a4c0cc20af2824df0f1a9406170b078b6f1ec227e8e6c60c488baf99896b38dc35c43110538e0b82285dcb79bdad3b2
+DIST quassel-0.12.2.tar.bz2 3681838 SHA256 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897 SHA512 0c907982af0ba11af6ba5d075850149dc4d4df0c759a736dfaccdc01778958bd9b0137515c2d78a72a1b5aef6600cea47505de6ee905d83a51cf4e67d132911d WHIRLPOOL 947c47ab6a5db73fdda7d5e5fc3f618030e9c2cfd78f4f423b32332e6514b5c3b8d24423a6be8ee8bf81e2e4a973aa29578e776dba5e8f7ad947acbcb7aef497
 EBUILD quassel-0.10.0-r1.ebuild 4993 SHA256 61e6419c63aacf38855e4f89125b2b31e642227bfc8e337796f93b73aa8b672f SHA512 7bcee9ab879e2b9545743dcf91f7b6e70101791b34e40021fd0161c2c3a2fd0223934aaa48e11eb865662215fd95928f70478cfb189b1f2607caecf8415320c2 WHIRLPOOL 1c884fc4354a533da41d18d8bb26834d0828e62d0514eb5ffc9e8ae52c4d049861c53979e5a0c546ecd84e0cf189fd50b3877c561518c6e3ec6cead478fac0bb
-EBUILD quassel-0.11.0-r1.ebuild 5666 SHA256 16d4a6ad5c8c5e2600b28a31e8febb73d94077594d19c3d54773c0a4d3236b50 SHA512 868b6f4f40dabe0cfdddf900ddac6ef3736af2e0ed0eeffe7dbaaf991fb44b1af8cb07ff551afd617930c58046bbd4e9675d3f4efc0747dc7552920bbc5d6808 WHIRLPOOL db202c837e9dbd36bd5427976c1e32efde329bbb94f90a373030caf19ea190548d3f9d6cdfafd6e4eb174e6f117352bc10eaa9fc819309f860ba4cd37a86ce79
-EBUILD quassel-0.12.0.ebuild 5970 SHA256 53ef1da82418545336865f68a0bc3bc7bc4c155bea96d035e98d85faf20f7672 SHA512 89083471978240f75f2fd49c1f49bf6add5a385961e86124bfb88844cd9b0bda71a7a1b00684c84dad9affbc902843425984d2bc1133c2788bcd101558270839 WHIRLPOOL 33f1ddac60b3f3ff28cf3aeadba6a29850f0faf4303c672869460f095361f88bc2c6d8354173e84f46385f4821c32465ecd94cabd20d87b79ac94f9350d2edca
-EBUILD quassel-0.12.1.ebuild 5970 SHA256 6594dffb198a749f2eef6a9f5b0c03354e93fefbdfbd11f01a918e2f3f01ded8 SHA512 1f6035d0ea7857bd8a5dbeb1d66b42b7ff97e958ef97a31faf7e7ea5c9d7aac750d3e5dea160efdcbcf69c4df0ff049b603b00d9cfb6c3b26aba3eed7527f98e WHIRLPOOL 6c3be5b8df6c0bf63b315348f12c5cf1485902fddaa65d97d7e46f7e85a14acc2d594d58a0356594455cf7cf6f3e3ba5c018a6a30f6f0d24a3a3bdde5045a817
+EBUILD quassel-0.11.1.ebuild 5615 SHA256 87058ef751d1eb5353d9e348b55d90f08d32d812f71a4ade7969a014c1e55d9d SHA512 94fe62aee76f6a84d8c0e1726391ef81a5a5162f2d7600063aa560c7989c6b27c807b362d9fef89a9f3f55831cda89710ed26dc0adaf2946fceb9c016744d680 WHIRLPOOL 47906dc04d4389e8f93820fa238cd356997f37f1a2aeba793094a85cd3ac6831669e365afdefe7ef099231031511193c16685f84a7f28d43908a8299a3f91247
+EBUILD quassel-0.12.2.ebuild 5970 SHA256 fa68b9fda7e1472da5f8ed24dc335ed78f8516f87c28de8cb273826becf7c26d SHA512 aa9d5e8a89ca8d095c63ed1e9aa1c8822905b023cf3b80af0044a51e7488d1a0fbc6d5b5b88ab69cb3192c1652da662d0d460abeea2d7daeb8ad0a0d17ffc0eb WHIRLPOOL f321640d634e6c7f0317eec5ff465e38d1379668e1e9dec9fdec91e51abca91315f51ac73f7ce159e0b2a51423d9aeb7577fc769349a78e545c87b6c31c25fe9
 EBUILD quassel-9999.ebuild 5949 SHA256 a8f6158e8af59da7da91055a573461b29f676187d3315873d88721045b636a83 SHA512 8e230ceb9aa4a3be7663adda98ef27dee4343c11c4e5a169b30c599540df024b9dd3bf5a9e1d7a7a587e12102949b713bd04e85f377af42fa40c9f9cff2a8ed3 WHIRLPOOL ce21e1d0b332659897b4e5c955b77efc81ea46683309720347bcd023893cdd375d3d511762748f11fd103652dca13ac25b452d60880807c4a909542d68b5df61
-MISC ChangeLog 31626 SHA256 d25e83e5c31f9cba566007a62cb3733b40a3d4e426d37c9b507dbccf0ef3074b SHA512 7bf6bc15b124aab167d3b1a73681a2d67912f8051b5355e8d9e12c4b8a43f383737960d01f2baa78e9f6835c62b97548e18f76d41764352e4e808bbea3332d73 WHIRLPOOL 8a2f819b72b2a9673d25a64cbb79ecdb3d1ce7eeead78e77991029ed50db9df050e932c6ee7e85fa24ac1b9215d1b7a3611d4e8e37d956ad2ad13ddf71722bc8
+MISC ChangeLog 31884 SHA256 4fe6af9dae65b61d9ddbde7ef89eafc001d97928ee8224ac89b5a1fe0b39bc9f SHA512 1711327256bda809b0a33782985bc9ff77e2a99c1ad6a987c0f61184e458815c328fe13e60958315249bac9a815783dc4320573947f6e674d05509b315ac2e3d WHIRLPOOL c4dc977df7e6e8f8b6799637f4c04177935a744b66454e27d1ba729b7abf2f1ffe54ca09573c9fe00b0a00b7b7a721114859d72b9fd11b1aabd58f998c24aeff
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
diff --git a/net-irc/quassel/quassel-0.11.0-r1.ebuild b/net-irc/quassel/quassel-0.11.1.ebuild
index 61b8e6329d87..c43bf2af824c 100644
--- a/net-irc/quassel/quassel-0.11.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.0-r1.ebuild,v 1.1 2015/03/30 05:47:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.1.ebuild,v 1.1 2015/04/24 03:23:46 patrick Exp $
 
 EAPI=5
 
@@ -93,13 +93,11 @@ REQUIRED_USE="
 	kde? ( phonon || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana !crypt !kde phonon )
+	qt5? ( !ayatana !crypt !kde )
 	syslog? ( || ( server monolithic ) )
 	webkit? ( || ( X monolithic ) )
 "
 
-PATCHES=( "${FILESDIR}"/DOS-sec.patch )
-
 pkg_setup() {
 	if use server; then
 		QUASSEL_DIR=/var/lib/${PN}
diff --git a/net-irc/quassel/quassel-0.12.1.ebuild b/net-irc/quassel/quassel-0.12.1.ebuild
deleted file mode 100644
index f03c149de6fa..000000000000
--- a/net-irc/quassel/quassel-0.12.1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# 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.1.ebuild,v 1.2 2015/04/22 08:36:21 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="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-	qt5? (
-		dev-qt/qtscript:5
-		crypt? ( app-crypt/qca:2[openssl,qt5] )
-		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
-		)
-		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] )
-		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
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-REQUIRED_USE="
-	|| ( X server monolithic )
-	ayatana? ( || ( X monolithic ) )
-	crypt? ( || ( server monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) )
-	phonon? ( || ( X monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	qt5? ( !ayatana )
-	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 crypt QCA2-QT5)
-		$(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
-}
diff --git a/net-irc/quassel/quassel-0.12.0.ebuild b/net-irc/quassel/quassel-0.12.2.ebuild
index d1882b1ab6a5..775e5cb8fe00 100644
--- a/net-irc/quassel/quassel-0.12.0.ebuild
+++ b/net-irc/quassel/quassel-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.2 2015/04/22 08:36:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.12.2.ebuild,v 1.1 2015/04/24 03:23:46 patrick Exp $
 
 EAPI=5