diff options
Diffstat (limited to 'net-im/sim')
| -rw-r--r-- | net-im/sim/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/sim/Manifest | 41 | ||||
| -rw-r--r-- | net-im/sim/files/digest-sim-0.9.4.3 | 3 | ||||
| -rw-r--r-- | net-im/sim/sim-0.9.4.3-r1.ebuild | 24 | ||||
| -rw-r--r-- | net-im/sim/sim-0.9.4.3.ebuild | 97 | ||||
| -rw-r--r-- | net-im/sim/sim-9999.ebuild | 98 |
6 files changed, 86 insertions, 186 deletions
diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog index 4f7add9a5f14..f0d0654db7a8 100644 --- a/net-im/sim/ChangeLog +++ b/net-im/sim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/sim # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.85 2008/01/14 19:00:05 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.86 2008/01/22 13:38:27 pva Exp $ + + 22 Jan 2008; <pva@gentoo.org> -sim-0.9.4.3.ebuild, sim-0.9.4.3-r1.ebuild, + sim-9999.ebuild: + Fixed depends for kde-4, bug 206732, thank Ingmar Vanhassel for the fix. + Updated sim live svn ebuild to use cmake based build, bug 200684, thank you + Bernd Steinhauser <gentoo AT bernd-steinhauser.de> for work on this. Removed + old ebuild. 14 Jan 2008; Christoph Mende <angelos@gentoo.org> sim-0.9.4.3-r1.ebuild: Stable on amd64 wrt bug #202113 diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest index 86217f7f1706..981ce07c161a 100644 --- a/net-im/sim/Manifest +++ b/net-im/sim/Manifest @@ -1,45 +1,28 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX sim-0.9.4.3-double-message-fix.patch 882 RMD160 adf7304d31d6cb90b4c64098b5ec993355d050fc SHA1 43d1dc1d32cc8a229b1ff6759f1e5bc6f6bdc627 SHA256 997d40dd9a23b55e02c8dc0a5c9bcf81de93b0dd0c2bea673961e1e31d76cc41 MD5 0e8a31d6139f1564426eb32c3c562799 files/sim-0.9.4.3-double-message-fix.patch 882 RMD160 adf7304d31d6cb90b4c64098b5ec993355d050fc files/sim-0.9.4.3-double-message-fix.patch 882 SHA256 997d40dd9a23b55e02c8dc0a5c9bcf81de93b0dd0c2bea673961e1e31d76cc41 files/sim-0.9.4.3-double-message-fix.patch 882 DIST sim-0.9.4.3-r1919_1924.patch.bz2 53044 RMD160 9982bc984fb8befe0680cae7115fdad575936458 SHA1 e8e7cc8da756f5e7686e416afe79a42cb76442d9 SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f DIST sim-0.9.4.3.tar.bz2 3251965 RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c SHA1 6d181b4cb6b8470dd874a409578c02504f157b3e SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9 -EBUILD sim-0.9.4.3-r1.ebuild 2742 RMD160 d1cc78c6145b60709833c88736454cb61caa8f9e SHA1 6e1532e7d88e8957e576f56b754dcd97ad396d8d SHA256 f56b274fb3cc57c63575817baf02fd0744d30486141a9714d261b73629160f1e -MD5 c7ba53890d29b8485ee1087510e6fb5e sim-0.9.4.3-r1.ebuild 2742 -RMD160 d1cc78c6145b60709833c88736454cb61caa8f9e sim-0.9.4.3-r1.ebuild 2742 -SHA256 f56b274fb3cc57c63575817baf02fd0744d30486141a9714d261b73629160f1e sim-0.9.4.3-r1.ebuild 2742 -EBUILD sim-0.9.4.3.ebuild 2596 RMD160 e8e8af2802fdd5ff6d7c5d20fb0c356a9169d452 SHA1 8ca5a1a041a845a74bc93282986b3a14dfa3f1eb SHA256 fe6007bffc28af33686cfa982af2989b61810cdd16b26a8d030813fd7151cb92 -MD5 d729a5fe8026feba7aaa7fdbffe554f6 sim-0.9.4.3.ebuild 2596 -RMD160 e8e8af2802fdd5ff6d7c5d20fb0c356a9169d452 sim-0.9.4.3.ebuild 2596 -SHA256 fe6007bffc28af33686cfa982af2989b61810cdd16b26a8d030813fd7151cb92 sim-0.9.4.3.ebuild 2596 -EBUILD sim-9999.ebuild 2316 RMD160 4c0ee1dde45bcef750a78967ab3ccf138b333c40 SHA1 84983b5b28aeb654d8f966af142cbb8b6a6aa76a SHA256 77cee4c5624868be108fae2118d1e2dbb73cded79e4497bc73243f84220c145f -MD5 e62f7ca39d74c4a1266d0024b36e0a26 sim-9999.ebuild 2316 -RMD160 4c0ee1dde45bcef750a78967ab3ccf138b333c40 sim-9999.ebuild 2316 -SHA256 77cee4c5624868be108fae2118d1e2dbb73cded79e4497bc73243f84220c145f sim-9999.ebuild 2316 -MISC ChangeLog 12311 RMD160 aa01885e89af25da75f23f9e22b6cab259ea0768 SHA1 8368667628e47fafa2cbd9d710df23147c1540b8 SHA256 b1d031b78372c77efd7b1413f4821b7e907554aa6a8fec9e51c909c2d3971bd5 -MD5 618f6b5ae36650bb250da276a5c848fb ChangeLog 12311 -RMD160 aa01885e89af25da75f23f9e22b6cab259ea0768 ChangeLog 12311 -SHA256 b1d031b78372c77efd7b1413f4821b7e907554aa6a8fec9e51c909c2d3971bd5 ChangeLog 12311 +EBUILD sim-0.9.4.3-r1.ebuild 2779 RMD160 157b9c6a62beed0087a8fd8ce0b64a1900446ef4 SHA1 0219c6b494ee390af57d6ccfb49cf84d9c545dcb SHA256 cc14ebc5a1033b310c52db814af00d406bf1021c9c764f1c4131f9b9de2990d9 +MD5 be038486892545ea29573fe375bb731f sim-0.9.4.3-r1.ebuild 2779 +RMD160 157b9c6a62beed0087a8fd8ce0b64a1900446ef4 sim-0.9.4.3-r1.ebuild 2779 +SHA256 cc14ebc5a1033b310c52db814af00d406bf1021c9c764f1c4131f9b9de2990d9 sim-0.9.4.3-r1.ebuild 2779 +EBUILD sim-9999.ebuild 3125 RMD160 13e3509040d6b26a5e8f86768d0d18c3019490e9 SHA1 28a1ae327ed98550d0d2ea43da953cedc245c3cf SHA256 571587a6302571718062584ce3e67412f0feabff6a6e714674659f833ae4dec5 +MD5 e7eb1bbe454aafab445966a3476f6df8 sim-9999.ebuild 3125 +RMD160 13e3509040d6b26a5e8f86768d0d18c3019490e9 sim-9999.ebuild 3125 +SHA256 571587a6302571718062584ce3e67412f0feabff6a6e714674659f833ae4dec5 sim-9999.ebuild 3125 +MISC ChangeLog 12649 RMD160 4d4877337b053cfc3fd70cde7aaee7d71a6be9a5 SHA1 adf12f5e21bf10ad0d1e1fbfd87e006d9d8a5102 SHA256 81efba57fd943b8392a43ed65456579822577a05cb1642fc516b2e17f29f2928 +MD5 730bcde7517ea76b497f47e6cd44d5ba ChangeLog 12649 +RMD160 4d4877337b053cfc3fd70cde7aaee7d71a6be9a5 ChangeLog 12649 +SHA256 81efba57fd943b8392a43ed65456579822577a05cb1642fc516b2e17f29f2928 ChangeLog 12649 MISC metadata.xml 507 RMD160 7ff8ac8164276338a780a1e8441ca14b7f41a7e4 SHA1 b1b15267602a354ad1124c9eccf281b5b5960d2f SHA256 260177f2cc2f6010a6d29dccb4190b8d7480f5af803fb73bdf0ac151a685b92f MD5 3af162e57508c83727e10edddce8117b metadata.xml 507 RMD160 7ff8ac8164276338a780a1e8441ca14b7f41a7e4 metadata.xml 507 SHA256 260177f2cc2f6010a6d29dccb4190b8d7480f5af803fb73bdf0ac151a685b92f metadata.xml 507 -MD5 54eb49f6a317c6239d299de7ffc268cb files/digest-sim-0.9.4.3 241 -RMD160 c7b84f5c6c238d2e5e02f552f461ddf059e0ed7c files/digest-sim-0.9.4.3 241 -SHA256 3335593e5767bc7144383c647707d2b8ea04d511bad7327c17591337f9d2efd9 files/digest-sim-0.9.4.3 241 MD5 55fd78610e42545c39e01bc7a8a40405 files/digest-sim-0.9.4.3-r1 515 RMD160 0db1797e69a1753775afc9b1ca81d111ecd5b6d6 files/digest-sim-0.9.4.3-r1 515 SHA256 8751d520d26dc45f55cce245ca57a368b44f92bfe7be53e4b5c6a37d0368d054 files/digest-sim-0.9.4.3-r1 515 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sim-9999 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-sim-9999 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-sim-9999 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.8 (GNU/Linux) - -iEYEARECAAYFAkeLsTsACgkQKhnDs22gwa/EyACgxKkrCQeWQrkg4vfGVgYGCqVV -cxIAoItysjSRWLUwjWfP8MiEm9ci9uX9 -=NBZi ------END PGP SIGNATURE----- diff --git a/net-im/sim/files/digest-sim-0.9.4.3 b/net-im/sim/files/digest-sim-0.9.4.3 deleted file mode 100644 index ebef92464401..000000000000 --- a/net-im/sim/files/digest-sim-0.9.4.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4bc30577e619e05252d394d51dc20747 sim-0.9.4.3.tar.bz2 3251965 -RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c sim-0.9.4.3.tar.bz2 3251965 -SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9 sim-0.9.4.3.tar.bz2 3251965 diff --git a/net-im/sim/sim-0.9.4.3-r1.ebuild b/net-im/sim/sim-0.9.4.3-r1.ebuild index 2f0e2f0c79e8..5480b34a7c8f 100644 --- a/net-im/sim/sim-0.9.4.3-r1.ebuild +++ b/net-im/sim/sim-0.9.4.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.6 2008/01/14 19:00:05 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.7 2008/01/22 13:38:27 pva Exp $ inherit kde-functions eutils flag-o-matic @@ -17,8 +17,8 @@ IUSE="debug kde spell ssl" RESTRICT="fetch" # kdebase-data provides the icon "licq.png" -RDEPEND="kde? ( kde-base/kdelibs - || ( kde-base/kdebase-data kde-base/kdebase ) ) +RDEPEND="kde? ( =kde-base/kdelibs-3.5* + || ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* ) ) !kde? ( $(qt_min_version 3) spell? ( app-text/aspell ) ) ssl? ( dev-libs/openssl ) @@ -44,9 +44,9 @@ pkg_nofetch() { } pkg_setup() { - if use kde ; then + if use kde; then if use spell; then - if ! built_with_use kde-base/kdelibs spell ; then + if ! built_with_use "=kde-base/kdelibs-3.5*" spell; then ewarn "kde-base/kdelibs were merged without spell in USE." ewarn "Thus spelling will not work in sim. Please, either" ewarn "reemerge kde-base/kdelibs with spell in USE or emerge" @@ -54,7 +54,7 @@ pkg_setup() { ebeep fi else - if built_with_use kde-base/kdelibs spell ; then + if built_with_use "=kde-base/kdelibs-3.5*" spell; then ewarn 'kde-base/kdelibs were merged with spell in USE.' ewarn 'Thus spelling will work in sim. Please, either' ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' @@ -62,7 +62,7 @@ pkg_setup() { ebeep fi fi - if ! built_with_use kde-base/kdelibs arts ; then + if ! built_with_use "=kde-base/kdelibs-3.5*" arts; then myconf="--without-arts" fi fi @@ -74,8 +74,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-double-message-fix.patch epatch ../${P}-r1919_1924.patch - if use kde ; then - set-kdedir 3 + if use kde; then + set-kdedir 3 fi } @@ -87,9 +87,9 @@ src_compile() { use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" - econf ${myconf} `use_enable kde` \ - `use_with ssl` \ - `use_enable debug` || die "econf failed" + econf ${myconf} $(use_enable kde) \ + $(use_with ssl) \ + $(use_enable debug) || die "econf failed" emake -j1 || die "make failed" } diff --git a/net-im/sim/sim-0.9.4.3.ebuild b/net-im/sim/sim-0.9.4.3.ebuild deleted file mode 100644 index 288f4d5c1b41..000000000000 --- a/net-im/sim/sim-0.9.4.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3.ebuild,v 1.7 2007/11/17 17:23:45 pva Exp $ - -inherit kde-functions eutils flag-o-matic - -DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo." -HOMEPAGE="http://sim-im.org/" -SRC_URI="http://download.berlios.de/sim-im/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug kde spell ssl" - -RESTRICT="fetch" - -# kdebase-data provides the icon "licq.png" -RDEPEND="kde? ( kde-base/kdelibs - || ( kde-base/kdebase-data kde-base/kdebase ) ) - !kde? ( $(qt_min_version 3) - spell? ( app-text/aspell ) ) - ssl? ( dev-libs/openssl ) - dev-libs/libxml2 - dev-libs/libxslt - sys-libs/zlib - x11-libs/libXScrnSaver" - -DEPEND="${RDEPEND} - sys-devel/flex - app-arch/zip - x11-proto/scrnsaverproto" - -pkg_nofetch() { - einfo "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus" - einfo "you have to download and it put into ${DISTDIR} by yourself." - einfo "Download location:" - echo - einfo "${SRC_URI}" - echo - einfo "See http://archives.gentoo.org/gentoo-dev/msg_144003.xml for further" - einfo "information." -} - -pkg_setup() { - if use kde ; then - if use spell; then - if ! built_with_use kde-base/kdelibs spell ; then - ewarn "kde-base/kdelibs were merged without spell in USE." - ewarn "Thus spelling will not work in sim. Please, either" - ewarn "reemerge kde-base/kdelibs with spell in USE or emerge" - ewarn 'sim with USE="-spell" to avoid this message.' - ebeep - fi - else - if built_with_use kde-base/kdelibs spell ; then - ewarn 'kde-base/kdelibs were merged with spell in USE.' - ewarn 'Thus spelling will work in sim. Please, either' - ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' - ewarn 'sim with USE="spell" to avoid this message.' - ebeep - fi - fi - if ! built_with_use kde-base/kdelibs arts ; then - myconf="--without-arts" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if use kde ; then - set-kdedir 3 - fi -} - -src_compile() { - filter-flags -fstack-protector -fstack-protector-all - - # Workaround for bug #119906 - append-flags -fno-stack-protector - - use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" - - econf ${myconf} `use_enable kde` \ - `use_with ssl` \ - `use_enable debug` || die "econf failed" - - emake -j1 || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed." - dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog -} diff --git a/net-im/sim/sim-9999.ebuild b/net-im/sim/sim-9999.ebuild index 235849192b7d..353cf862804b 100644 --- a/net-im/sim/sim-9999.ebuild +++ b/net-im/sim/sim-9999.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.1 2007/12/14 17:11:21 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.2 2008/01/22 13:38:27 pva Exp $ -inherit subversion kde-functions eutils flag-o-matic +EAPI="1" + +inherit cmake-utils kde-functions eutils flag-o-matic subversion ESVN_REPO_URI="svn://svn.berlios.de/sim-im/trunk" ESVN_PROJECT="sim-im" -ESVN_BOOTSTRAP="make -f ./admin/Makefile.common" DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo." HOMEPAGE="http://sim-im.org/" @@ -14,28 +15,34 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug kde spell ssl" +IUSE="debug gpg +jabber kde msn +oscar sms spell ssl weather yahoo livejournal" + +# It's possible to disable/enable pluging defining SIMCMAKEOPTS. E.g. put +# SIMCMAKEOPTS="-DENABLE_PLUGIN_TRANSPARENT:BOOL=Off" +# inside /etc/portage/env/net-im/sim to disable transparent plugin. # kdebase-data provides the icon "licq.png" -RDEPEND="kde? ( kde-base/kdelibs - || ( kde-base/kdebase-data kde-base/kdebase ) ) - !kde? ( $(qt_min_version 3) - spell? ( app-text/aspell ) ) - ssl? ( dev-libs/openssl ) - dev-libs/libxml2 - dev-libs/libxslt - sys-libs/zlib - x11-libs/libXScrnSaver" +DEPEND="kde? ( kde-base/kdelibs:3.5 ) + !kde? ( spell? ( app-text/aspell ) ) + x11-libs/qt:3 + ssl? ( dev-libs/openssl ) + dev-libs/libxml2 + dev-libs/libxslt + sys-libs/zlib + media-libs/fontconfig + x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - sys-devel/flex - app-arch/zip - x11-proto/scrnsaverproto" +RDEPEND="${DEPEND} + kde? ( || ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 ) ) + gpg? ( app-crypt/gnupg ) + sys-devel/flex + app-arch/zip + x11-proto/scrnsaverproto" pkg_setup() { - if use kde ; then + if use kde; then if use spell; then - if ! built_with_use kde-base/kdelibs spell ; then + if ! built_with_use "kde-base/kdelibs:3.5" spell; then ewarn "kde-base/kdelibs were merged without spell in USE." ewarn "Thus spelling will not work in sim. Please, either" ewarn "reemerge kde-base/kdelibs with spell in USE or emerge" @@ -43,7 +50,7 @@ pkg_setup() { ebeep fi else - if built_with_use kde-base/kdelibs spell ; then + if built_with_use "kde-base/kdelibs:3.5" spell; then ewarn 'kde-base/kdelibs were merged with spell in USE.' ewarn 'Thus spelling will work in sim. Please, either' ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' @@ -51,36 +58,39 @@ pkg_setup() { ebeep fi fi - if ! built_with_use kde-base/kdelibs arts ; then - myconf="--without-arts" - fi fi -} - -src_unpack() { - subversion_src_unpack - - if use kde ; then - set-kdedir 3 + if ! use jabber && ! use livejournal && ! use msn && ! use oscar && ! use yahoo; then + eerror "Sim requires at least one instant messaging protocol to be" + eerror "activated. The available protocols are:" + eerror "\"jabber livejournal msn oscar yahoo\"." + die "No instant messaging protocol activated." fi } src_compile() { - filter-flags -fstack-protector -fstack-protector-all - - # Workaround for bug #119906 - append-flags -fno-stack-protector - - use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" - - econf ${myconf} `use_enable kde` \ - `use_with ssl` \ - `use_enable debug` || die "econf failed" + if use kde; then + set-kdedir 3 + fi + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_enable debug PLUGIN_LOGGER) + $(cmake-utils_use_enable gpg PLUGIN_GPG) + $(cmake-utils_use_enable jabber PLUGIN_JABBER) + $(cmake-utils_use_enable livejournal PLUGIN_LIVEJOURNAL) + $(cmake-utils_use_enable kde KDE3) + $(cmake-utils_use_enable msn PLUGIN_MSN) + $(cmake-utils_use_enable oscar PLUGIN_ICQ) + $(cmake-utils_use_enable sms PLUGIN_SMS) + $(cmake-utils_use_enable spell PLUGIN_SPELL) + $(cmake-utils_use_enable ssl OPENSSL) + $(cmake-utils_use_enable weather PLUGIN_WEATHER) + $(cmake-utils_use_enable yahoo PLUGIN_YAHOO) + -DENABLE_PLUGIN_UPDATE:BOOL=Off + ${SIMCMAKEOPTS}" - emake || die "make failed" + cmake-utils_src_compile } src_install() { - make DESTDIR="${D}" install || die "make install failed." - dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog + cmake-utils_src_install + dodoc TODO TODO.CMake README AUTHORS.sim jisp-resources.txt ChangeLog } |