Version bump to latest release. Drop r1 which is no-longer needed.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

2 files changed, 22 insertions, 23 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 64289a3b7406..48fe254b30ec 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.123 2011/02/10 09:26:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.124 2011/03/24 15:04:26 scarabeus Exp $
+
+*quassel-0.7.2 (24 Mar 2011)
+
+  24 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -quassel-0.7.1-r1.ebuild, +quassel-0.7.2.ebuild:
+  Version bump to latest release. Drop r1 which is no-longer needed.
 
 *quassel-0.7.1-r1 (10 Feb 2011)
 
diff --git a/net-irc/quassel/quassel-0.7.1-r1.ebuild b/net-irc/quassel/quassel-0.7.2.ebuild
index 9147279cb2a5..959df3e02789 100644
--- a/net-irc/quassel/quassel-0.7.1-r1.ebuild
+++ b/net-irc/quassel/quassel-0.7.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.1-r1.ebuild,v 1.1 2011/02/10 09:26:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.2.ebuild,v 1.1 2011/03/24 15:04:26 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
@@ -18,7 +18,7 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS=""
 SLOT="0"
 IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
 
@@ -58,14 +58,6 @@ RDEPEND="
 		server? ( ${SERVER_RDEPEND} )
 		X? ( ${GUI_RDEPEND} )
 	)
-	!monolithic? (
-		!server? (
-			!X? (
-				${SERVER_RDEPEND}
-				${GUI_RDEPEND}
-			)
-		)
-	)
 	"
 DEPEND="${RDEPEND}"
 
@@ -73,15 +65,18 @@ DOCS="AUTHORS ChangeLog README"
 
 S="${WORKDIR}/${P/_/-}"
 
-pkg_setup() {
-	if ! use monolithic && ! use server && ! use X ; then
-		ewarn "You have to build at least one of the monolithic client (USE=monolithic),"
-		ewarn "the quasselclient (USE=X) or the quasselcore (USE=server)."
-		echo
-		ewarn "Enabling monolithic by default."
-		FORCED_MONO="yes"
-	fi
+REQUIRED_USE="
+	|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	postgres? ( || ( 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}
@@ -107,8 +102,6 @@ src_configure() {
 		"-DEMBED_DATA=OFF"
 	)
 
-	[[ ${FORCED_MONO} == "yes" ]] && mycmakeargs+=( '-DWANT_MONO=ON' )
-
 	cmake-utils_src_configure
 }
 
@@ -131,7 +124,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then
+	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