diff options
| -rw-r--r-- | net-irc/quassel/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-0.7.1.ebuild | 173 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-0.7.2.ebuild | 10 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 8 |
4 files changed, 14 insertions, 183 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/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/" |