Use git-2 eclass. Drop 0.7.1. Stabilise 0.7.2 on x86 and amd64.

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

5 files changed, 21 insertions, 202 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index e14502b079f7..6fdd22b9d3e6 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2011/03/26 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.127 2011/04/20 11:12:35 scarabeus Exp $
+
+  20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -quassel-0.7.1.ebuild,
+  quassel-0.7.2.ebuild, quassel-9999.ebuild:
+  Use git-2 eclass. Drop 0.7.1. Stabilise 0.7.2 on x86 and amd64.
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   quassel-0.7.1.ebuild, quassel-0.7.2.ebuild, quassel-9999.ebuild:
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 991682c8e068..476d7c1bea86 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,30 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 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
 DIST quassel-0.7.2.tar.bz2 2714322 RMD160 02e779a4cf0bab683691ff30767bd9625909d195 SHA1 dbbd8ebfde5aa12fb6b6841558049220d88bb9dc SHA256 b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c
-EBUILD quassel-0.7.1.ebuild 4864 RMD160 d3fc0745fffd0f5b882352843a034550040010f2 SHA1 987cbdd33334d92eb641ef28e2ef0650c39c407c SHA256 dd3cf5b20f435219f817dd6be171ab1f7bf412789fdb5409490f0ccaca38d801
-EBUILD quassel-0.7.2.ebuild 4669 RMD160 721ffe066b276833890e00565da419d88f32a3af SHA1 46aa5bab1b40ef42a98b51e6b2ec4a372a80fe9f SHA256 78f325c2f77de4f7449a4d550749e5db912a93258e679dea7f4153f4804ad3da
-EBUILD quassel-9999.ebuild 4645 RMD160 99ce386e2d3d7abafb192a348dfb2529c0637b64 SHA1 87e6d3dea75a339fa5963031be35ba8c890e039e SHA256 3d26b6ccde96b19894ded66ecce37c9ac745c046e6f34825b163b4f9100d2890
-MISC ChangeLog 21117 RMD160 ee8843e8a4c75f2018ccf497a0067f51dbd94722 SHA1 9daf807d8f63cd9e9d301bcf7f36e5e6d641a815 SHA256 e8aa622636089e33294d5959d2ef81db3e33c9438126c8fa46d5901946c3fcc3
+EBUILD quassel-0.7.2.ebuild 4739 RMD160 4a30e1bdbd787270cd8af2ea72384d4170497049 SHA1 070d87961a49c7b25722f4f7042c43e1259e0d43 SHA256 db83bac31218d853aa367a8d070bce7ca30de101f319106b08a44acda12af5ff
+EBUILD quassel-9999.ebuild 4717 RMD160 e04eecd5f3c09e684ddc7875199f30df4609cfaf SHA1 c31916808668196f8063d2cc11b8b3a3f3e08732 SHA256 de53d4bf21eceb69da2d02673ad63cdcf67c068968253d5262d2103bf26bc9bc
+MISC ChangeLog 21307 RMD160 076e077d0f7c22aae8b8cc025ed7124de749dfea SHA1 38611dc3a1d6831a32c336df51a0416060bec5d9 SHA256 8aaa7e067e324c1159925ccc92874383a794f5ae1e7fa3655f0398b877bdb543
 MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNjiG8AAoJENwGBM22xffeGrMP/2BVTnY8RCMe3vCYQ5o1BtCU
-onq5ObLT1DRLRlRv/YHhhMAglofAneGBJpxxUFmCMH1F8FTCut/+DhiJryJbA+w7
-VNNaGKxh3YBhmhOlVB/VH0+uSsmxSWSuh0J+nx0+Vm81qCPNZBNqMr6CgUg1Gxjy
-yrjY+EbaUofjfdbO55SsENQ7Jr41GYxKLbo7aOBUbGExFN284er+90loDso/M8md
-TqR5SQXHqA13+qSmD5gHV2IZI6ynvJpC1jW5SxoABTF7KbkQM7Zs14m9yXflVLZb
-D5ZO5/XOF0zKJqNO4f3sOJD8iJYs4VbwyTE/JqJS0NITQpr7f4YFQPetFQ+3IaXp
-tabgmmIj6brw8MG3CtL3VKQ4WaZmax68ch8RV4SVv90HhtY08+GrPjw3/XX7Zqfo
-7bYNFzF091jVtqkgog3si5Ww7J7Oomn5btQg7vrNoHx+YJyqcUNV+f9NamOcUowL
-xbv0puH14kkwLK/b8n9kwSo6bqMUh5ZBG7B0VBY9b+GJgpVzO2rwTjtSMb/xhhlX
-WwrieNuNiJeX+1yEPQv7g3zag00yi8ZBJkDOJn0Yxh0szoW5gk8Au/+6ntYyYo7O
-hefSPFH3YKhD5mHqco7KIv0CvfJmtIzHIpUwXu1CeEtPw7iHA14KG25xNeAYmZq8
-baSHfeVAhogNhuV4YKbY
-=Uk9b
+iEYEARECAAYFAk2uv6kACgkQHB6c3gNBRYdOnACfaA1I3cPm3sn15RnlLG0fSpP4
+0OYAn2WxSxSKgL7Dk63AIlD973k8DhcE
+=d9tr
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.7.1.ebuild b/net-irc/quassel/quassel-0.7.1.ebuild
deleted file mode 100644
index 527494f418d4..000000000000
--- a/net-irc/quassel/quassel-0.7.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.ebuild,v 1.9 2011/03/26 17:26:05 dilfridge Exp $
-
-EAPI=3
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
-EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git"
-
-QT_MINIMAL="4.6.0"
-KDE_MINIMAL="4.4"
-
-inherit cmake-utils eutils ${GIT_ECLASS}
-
-DESCRIPTION="Qt4/KDE4 IRC client suppporting 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 x86 ~amd64-linux"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
-
-SERVER_RDEPEND="
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
-	)
-	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
-	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
-	>=x11-libs/qt-script-${QT_MINIMAL}:4
-"
-
-GUI_RDEPEND="
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		>=x11-libs/qt-dbus-${QT_MINIMAL}:4
-		dev-libs/libdbusmenu-qt
-	)
-	kde? (
-		>=kde-base/kdelibs-${KDE_MINIMAL}
-		>=kde-base/oxygen-icons-${KDE_MINIMAL}
-		ayatana? ( kde-misc/plasma-widget-message-indicator )
-	)
-	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-${QT_MINIMAL} ) )
-	webkit? ( >=x11-libs/qt-webkit-${QT_MINIMAL}:4 )
-"
-
-RDEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}:4[ssl?]
-	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
-	)
-	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
-	)
-	!monolithic? (
-		!server? (
-			!X? (
-				${SERVER_RDEPEND}
-				${GUI_RDEPEND}
-			)
-		)
-	)
-	"
-DEPEND="${RDEPEND}"
-
-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
-
-	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 !kde OXYGEN)
-		$(cmake-utils_use_with crypt)
-		"-DEMBED_DATA=OFF"
-	)
-
-	[[ ${FORCED_MONO} == "yes" ]] && mycmakeargs+=( '-DWANT_MONO=ON' )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		# prepare folders in /var/
-		keepdir "${QUASSEL_DIR}"
-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-		# init scripts
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
-
-		# logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
-	fi
-}
-
-pkg_postinst() {
-	if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && 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
-
-	# temporary info mesage
-	if use server; 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.7.2.ebuild b/net-irc/quassel/quassel-0.7.2.ebuild
index 3abcf2eceae2..1bb8083befb2 100644
--- a/net-irc/quassel/quassel-0.7.2.ebuild
+++ b/net-irc/quassel/quassel-0.7.2.ebuild
@@ -1,24 +1,24 @@
 # 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.2.ebuild,v 1.3 2011/03/26 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.2.ebuild,v 1.4 2011/04/20 11:12:35 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git"
+[[ "${PV}" == "9999" ]] && GIT_ECLASS="git-2"
 
 QT_MINIMAL="4.6.0"
 KDE_MINIMAL="4.4"
 
-inherit cmake-utils eutils ${GIT_ECLASS}
+inherit cmake-utils eutils versionator ${GIT_ECLASS}
 
 DESCRIPTION="Qt4/KDE4 IRC client suppporting 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 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 SLOT="0"
 IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
 
@@ -135,7 +135,7 @@ pkg_postinst() {
 	fi
 
 	# temporary info mesage
-	if use server; then
+	if use server && [[ $(get_minor_version ${REPLACING_VERSIONS}) -lt 7 ]]; then
 		echo
 		ewarn "Please note that all configuration moved from"
 		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 317761fba7d8..3b7cf354c707 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,17 +1,17 @@
 # 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-9999.ebuild,v 1.59 2011/03/26 17:26:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.60 2011/04/20 11:12:35 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git"
+[[ "${PV}" == "9999" ]] && GIT_ECLASS="git-2"
 
 QT_MINIMAL="4.6.0"
 KDE_MINIMAL="4.4"
 
-inherit cmake-utils eutils ${GIT_ECLASS}
+inherit cmake-utils eutils versionator ${GIT_ECLASS}
 
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
@@ -135,7 +135,7 @@ pkg_postinst() {
 	fi
 
 	# temporary info mesage
-	if use server; then
+	if use server && [[ $(get_minor_version ${REPLACING_VERSIONS}) -lt 7 ]]; then
 		echo
 		ewarn "Please note that all configuration moved from"
 		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"