From 3c060780ba5cd1aa61e474a790fb6609dca4168c Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Fri, 5 May 2006 17:42:35 +0000 Subject: Version bump. Cleaning out broken ebuild. (Portage version: 2203-svn) --- net-im/sim/ChangeLog | 8 ++- net-im/sim/Manifest | 5 +- net-im/sim/files/digest-sim-0.9.4_pre060131 | 1 - net-im/sim/files/digest-sim-0.9.4_pre060504 | 1 + net-im/sim/sim-0.9.4_pre060131.ebuild | 97 -------------------------- net-im/sim/sim-0.9.4_pre060504.ebuild | 103 ++++++++++++++++++++++++++++ 6 files changed, 114 insertions(+), 101 deletions(-) delete mode 100644 net-im/sim/files/digest-sim-0.9.4_pre060131 create mode 100644 net-im/sim/files/digest-sim-0.9.4_pre060504 delete mode 100644 net-im/sim/sim-0.9.4_pre060131.ebuild create mode 100644 net-im/sim/sim-0.9.4_pre060504.ebuild (limited to 'net-im') diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog index d5ccc66516de..005a6a808422 100644 --- a/net-im/sim/ChangeLog +++ b/net-im/sim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/sim # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.54 2006/03/30 10:50:52 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.55 2006/05/05 17:42:35 pva Exp $ + +*sim-0.9.4_pre060504 (05 May 2006) + + 05 May 2006; Peter Volkov -sim-0.9.4_pre060131.ebuild, + +sim-0.9.4_pre060504.ebuild: + Version bump. Cleaning out broken ebuild. 30 Mar 2006; Peter Volkov sim-0.9.4_pre060131-r1.ebuild: Fix for missed xscreensaver dependency in autoaway plugin. diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest index 12fa40feba64..efb156029e9a 100644 --- a/net-im/sim/Manifest +++ b/net-im/sim/Manifest @@ -1,8 +1,9 @@ -MD5 e92fed8f8e81d16c42e8301bbc98b857 ChangeLog 8532 +MD5 d7cc5f498f695b087414674be6c90c26 ChangeLog 8718 MD5 7c72226f8c4698dd4677e190f3e5581b files/digest-sim-0.9.4_pre060114 64 MD5 5a5833d23169d51933f376329be11d63 files/digest-sim-0.9.4_pre060131 64 MD5 5a5833d23169d51933f376329be11d63 files/digest-sim-0.9.4_pre060131-r1 64 +MD5 ad004ae1086aa0cee38f6a15adf41d32 files/digest-sim-0.9.4_pre060504 64 MD5 3af162e57508c83727e10edddce8117b metadata.xml 507 MD5 675f162effe336e181cff3f83386eb39 sim-0.9.4_pre060114.ebuild 3333 MD5 aeacc23b3877f1bf807210e4745ad374 sim-0.9.4_pre060131-r1.ebuild 2676 -MD5 6d17edba29479a4e9d74a49eb2b47b66 sim-0.9.4_pre060131.ebuild 2562 +MD5 cb379ff092b454767d37354af2559888 sim-0.9.4_pre060504.ebuild 2810 diff --git a/net-im/sim/files/digest-sim-0.9.4_pre060131 b/net-im/sim/files/digest-sim-0.9.4_pre060131 deleted file mode 100644 index 1a10b2bdd55b..000000000000 --- a/net-im/sim/files/digest-sim-0.9.4_pre060131 +++ /dev/null @@ -1 +0,0 @@ -MD5 f076bb8297d8e7bec6530638b55c78e6 sim-060131.tar.bz2 4641738 diff --git a/net-im/sim/files/digest-sim-0.9.4_pre060504 b/net-im/sim/files/digest-sim-0.9.4_pre060504 new file mode 100644 index 000000000000..75efc5dcea0e --- /dev/null +++ b/net-im/sim/files/digest-sim-0.9.4_pre060504 @@ -0,0 +1 @@ +MD5 ad209bd845200222cd3b68f25c056315 sim-060504.tar.bz2 5422000 diff --git a/net-im/sim/sim-0.9.4_pre060131.ebuild b/net-im/sim/sim-0.9.4_pre060131.ebuild deleted file mode 100644 index 5004cf8aa457..000000000000 --- a/net-im/sim/sim-0.9.4_pre060131.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2006 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_pre060131.ebuild,v 1.2 2006/02/01 00:39:04 wormo Exp $ - -inherit kde-functions eutils debug flag-o-matic libtool - -myver=${PV##*_pre} - -DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo." -HOMEPAGE="http://developer.berlios.de/projects/sim-im/" -#SRC_URI="http://developer.berlios.de/projects/sim-im/${P}.tar.bz2" -SRC_URI="mirror://gentoo/${PN}-${myver}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="kde spell ssl" - -# 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" - -DEPEND="${RDEPEND} - sys-devel/flex - app-arch/zip" - -S=${WORKDIR}/${PN}-${myver} - -pkg_setup() { - if [ -n ${myver} ] ; then - ewarn "Building svn version exported on ${myver}." - fi - 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} - - need-autoconf 2.5 - need-automake 1.7 - - if use kde ; then - set-kdedir 3 - fi - - make -f admin/Makefile.common || die "Failed to create Makefiles..." - elibtoolize --reverse-deps -} - -src_compile() { - filter-flags -fstack-protector -fstack-protector-all - - # Workaround for bug #119906 - append-flags -fno-stack-protector - - if ! use kde ; then - use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" - fi - - econf ${myconf} `use_enable kde` \ - `use_with ssl` \ - `use_enable debug` || die "econf failed" - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed." - dodoc TODO README AUTHORS.sim ChangeLog AUTHORS -} diff --git a/net-im/sim/sim-0.9.4_pre060504.ebuild b/net-im/sim/sim-0.9.4_pre060504.ebuild new file mode 100644 index 000000000000..9238409f1e80 --- /dev/null +++ b/net-im/sim/sim-0.9.4_pre060504.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2006 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_pre060504.ebuild,v 1.1 2006/05/05 17:42:35 pva Exp $ + +inherit kde-functions eutils debug flag-o-matic libtool + +myver=${PV##*_pre} + +DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo." +HOMEPAGE="http://sim-im.org/" +#SRC_URI="http://developer.berlios.de/projects/sim-im/${P}.tar.bz2" +SRC_URI="mirror://gentoo/${PN}-${myver}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="kde spell ssl" + +# 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 + || ( x11-libs/libXScrnSaver virtual/x11 )" + +DEPEND="${RDEPEND} + sys-devel/flex + app-arch/zip + || ( x11-proto/scrnsaverproto virtual/x11 )" + +S=${WORKDIR}/${PN}-${myver} + +pkg_setup() { + if [ -n ${myver} ] ; then + ewarn "Building svn version exported on ${myver}." + fi + 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} + + need-autoconf 2.5 + need-automake 1.7 + + # To avoid questions setting version to the right one :) + sed -i -e "s:sim,0.9.5:sim,${PV%%_pre*}:" configure.in.in + sed -i -e "s: SVN \" __DATE__: SVN ${myver}\":" sim/sim.cpp + + if use kde ; then + set-kdedir 3 + fi + + make -f admin/Makefile.common || die "Failed to create Makefiles..." + elibtoolize --reverse-deps +} + +src_compile() { + filter-flags -fstack-protector -fstack-protector-all + + # Workaround for bug #119906 + append-flags -fno-stack-protector + + if ! use kde ; then + use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" + fi + + 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 ChangeLog AUTHORS +} -- cgit v1.2.3-65-gdbad