diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-30 15:06:36 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-30 15:06:36 +0000 |
| commit | bcdcf305575bc049c6f53a9c001ac1c452de3b40 (patch) | |
| tree | a8511ad25fc1ece93a4f2b1445108acb8192f079 /net-irc | |
| parent | Version bump, drop old (diff) | |
| download | historical-bcdcf305575bc049c6f53a9c001ac1c452de3b40.tar.gz historical-bcdcf305575bc049c6f53a9c001ac1c452de3b40.tar.bz2 historical-bcdcf305575bc049c6f53a9c001ac1c452de3b40.zip | |
Move live ebuild to eapi4.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/quassel/ChangeLog | 7 | ||||
| -rw-r--r-- | net-irc/quassel/Manifest | 4 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 37 |
3 files changed, 22 insertions, 26 deletions
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog index e3bf79ab4257..661d52ee3f06 100644 --- a/net-irc/quassel/ChangeLog +++ b/net-irc/quassel/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-irc/quassel -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.119 2010/11/04 14:46:11 scarabeus Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.120 2011/01/30 15:06:36 scarabeus Exp $ + + 30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild: + Move live ebuild to eapi4. 04 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild, metadata.xml: diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index 7041ada39bef..8b81421b24cf 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -3,6 +3,6 @@ AUX quasselcore.conf 714 RMD160 96e0d621deb67f4901840f89aa483f42504ed675 SHA1 b7 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.ebuild 4841 RMD160 00030d6516c58a1fb2c8ae0adf59fd144eb2ea8f SHA1 f86b76873179a92d699c2334ee77e315230cc982 SHA256 6beb02e14ee0d567ac60ac1b1ec2224c6b6601e1a3d123b18a063c2ba2a3cf43 -EBUILD quassel-9999.ebuild 4819 RMD160 efd65214fd84f65337629edc583ed412554ba818 SHA1 a4b09137ebe3327ca482c549ad8fd81af5c25c95 SHA256 ab14e737e8ab5671fc6eb31c6224a704601e9ffc1e30f5eaf7f960568c0ceca0 -MISC ChangeLog 20091 RMD160 d823bcc4ded0c71df2ccc829c5afa3c5555efc74 SHA1 54a5c21aee3460cee3f2670fb4ddaed9453f57d1 SHA256 736330e3e5b2a0bc8768d00c9ed91b9d07869c7a518780d610104c3eeb3be670 +EBUILD quassel-9999.ebuild 4622 RMD160 e171085d335e180f2edd0875bc91a81b41696da4 SHA1 0548fd2e90ebf1ae91057548f2e76f3adb512fd0 SHA256 844beeeccbacf115b62ed48fb95fa7c2057a7a4a340986bf519aa29129d01f3f +MISC ChangeLog 20197 RMD160 464f2e842a15c78cd80eadb895490f2936f7e986 SHA1 3336097f985148d3b25767eafb2e556c8754c70d SHA256 d289fc0bf7f6bfbd2efb1dad151cf218eb8b902d6674bab679c612a0533b2ab0 MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index cacc8f2438de..9aaca151b2ed 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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.55 2010/11/04 14:46:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.56 2011/01/30 15:06:36 scarabeus Exp $ -EAPI=3 +EAPI=4 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git" EGIT_BRANCH="master" @@ -55,14 +55,6 @@ RDEPEND=" server? ( ${SERVER_RDEPEND} ) X? ( ${GUI_RDEPEND} ) ) - !monolithic? ( - !server? ( - !X? ( - ${SERVER_RDEPEND} - ${GUI_RDEPEND} - ) - ) - ) " DEPEND="${RDEPEND}" @@ -70,15 +62,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} @@ -104,8 +99,6 @@ src_configure() { "-DEMBED_DATA=OFF" ) - [[ ${FORCED_MONO} == "yes" ]] && mycmakeargs+=( '-DWANT_MONO=ON' ) - cmake-utils_src_configure } @@ -128,7 +121,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 |