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

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 25 insertions, 25 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/Manifest b/net-irc/quassel/Manifest
index 5fa8a33d0fe1..7bba92588b94 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,8 +2,9 @@ AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c
 AUX quasselcore.conf 714 RMD160 96e0d621deb67f4901840f89aa483f42504ed675 SHA1 b75f8e5967aec6457cf20f8481c518eeeee16a35 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c
 AUX quasselcore.init 1868 RMD160 1178e2879f88a828aba354893e2c6db2b68c1198 SHA1 c229a580b8a2f47ac922fd8807573b609ce723a1 SHA256 ee2dde641cd1e2d399313f2459f5e251960f35f093a73e8fde87f7a4782f2735
 DIST quassel-0.7.1.tar.bz2 2714990 RMD160 d82cbfafa9fe27119b1fa66cfa417b688b6e8e7e SHA1 791086da977033a1bbee3effa317668b3726bd7f SHA256 914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd
-EBUILD quassel-0.7.1-r1.ebuild 4870 RMD160 e9b8c01651957f97d2b1a0cece2dc3c2d4651be4 SHA1 55e0c203c0365953d8c6f9298272822089932a29 SHA256 2f8d6d7821b2f7da71290bb4d7ec8124608e01459954a69da789a2cb50ff5204
+DIST quassel-0.7.2.tar.bz2 2714322 RMD160 02e779a4cf0bab683691ff30767bd9625909d195 SHA1 dbbd8ebfde5aa12fb6b6841558049220d88bb9dc SHA256 b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c
 EBUILD quassel-0.7.1.ebuild 4865 RMD160 2b6b57f8825c5f67f4a237c923c89406d2bb2287 SHA1 94448881b8fb5a8605670c769805bf55cd88c9c9 SHA256 37343618d1005961313158f3b5c1b340f94127647f7f77321bf938fc4ff419fe
+EBUILD quassel-0.7.2.ebuild 4646 RMD160 8e98eb9d114c63fb5e56b1ac5349a83cf3b3d07f SHA1 899ad9a9d1501f81e6e417a4437c7dec4fa97436 SHA256 cd5139efd955e1f3ee0b85cf93f51000edbf920f50754540012262e9a3aac0a4
 EBUILD quassel-9999.ebuild 4646 RMD160 8fb415b66a8a44b0eb0cdc45a6fc7a499fa5cd2c SHA1 8f42077d945512ce5999d217e48070614f318085 SHA256 3b0263441352e0a9802ef9943400c01c23afde51733d99635e76db2b40490939
-MISC ChangeLog 20644 RMD160 9679fb4ddbcad696e721316328e2d75b6dc848dc SHA1 3341f06ee0089513a447d648b77da8568ab11799 SHA256 9b1463a35f59503a2510777d765b3500f9496f43f90f096c147fe5cbb4c0c0ab
+MISC ChangeLog 20850 RMD160 e0cfddd798c7ea0f3c6a51dc18d8e417896037b3 SHA1 ce2d79eec364ee2ea4ad66e916f243811ef53d03 SHA256 ab3a62e7cc2f78c7806268b34221c3c6c03bad15d7596ed7812baf9d577189db
 MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c
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