summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2009-02-15 12:54:20 +0000
committerDaniel Black <dragonheart@gentoo.org>2009-02-15 12:54:20 +0000
commitc28e77a5e743a2e9d779e3d86d1d2340f984c826 (patch)
tree80db089993af1577dc4cbe5ad9ef75e83d23037f /net-im
parentarm/sh stable (diff)
downloadhistorical-c28e77a5e743a2e9d779e3d86d1d2340f984c826.tar.gz
historical-c28e77a5e743a2e9d779e3d86d1d2340f984c826.tar.bz2
historical-c28e77a5e743a2e9d779e3d86d1d2340f984c826.zip
version bump as per bug #259071 - patch for kde4 as per bug #257247 thanks to Michael Davidsaver. removed 1.4 because of bug #256561
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/twinkle/ChangeLog10
-rw-r--r--net-im/twinkle/Manifest7
-rw-r--r--net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch24
-rw-r--r--net-im/twinkle/twinkle-1.4.1.ebuild (renamed from net-im/twinkle/twinkle-1.4.ebuild)16
4 files changed, 47 insertions, 10 deletions
diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 26a27c7b40fb..a89533cdec52 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-im/twinkle
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.44 2009/01/27 17:57:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.45 2009/02/15 12:54:20 dragonheart Exp $
+
+*twinkle-1.4.1 (15 Feb 2009)
+
+ 15 Feb 2009; Daniel Black <dragonheart@gentoo.org>
+ +files/twinkle-1.4.1-kdedetect.patch, -twinkle-1.4.ebuild,
+ +twinkle-1.4.1.ebuild:
+ version bump as per bug #259071 - patch for kde4 as per bug #257247 thanks
+ to Michael Davidsaver. removed 1.4 because of bug #256561
*twinkle-1.4 (27 Jan 2009)
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index bcde20d583fb..a324fd1a544b 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,12 +1,13 @@
AUX twinkle-0.4.1-badcflags.patch 492 RMD160 136c6387c0053d0457e4be766a8bfdbaeaccc5b1 SHA1 12ec8f94c73dd25fb82ed2c556ad72a8f5a394e8 SHA256 7bcb91795fa0e9c0db4dc174151ed9b3850eeca132844330d65d8429949296d9
AUX twinkle-1.0.1-icmp.patch 569 RMD160 c3d56c9f2221a9ed29e99b7bde9df104a6094dca SHA1 6f5ecbb700af176251c054320e2b5f878b8347e0 SHA256 f1995018874fad61d1b7a49d0c90cf9ad29e150c4947ae5c90e398e169f91cfc
AUX twinkle-1.3.1-withoutkde.patch 401 RMD160 8bb54a4017be0a168ebcc964d6f2803bc498f591 SHA1 2e1afa7ba0457b7d4968f4ee9b689cd6a7269996 SHA256 9206e92ef9da362993275fe0db50e9eed87ebcc11fb2eba719d85bde36a1ab27
+AUX twinkle-1.4.1-kdedetect.patch 892 RMD160 20a7fa1d5187c7411b27c78780b8c18ad3b52427 SHA1 31b03362954636f1770d8c8b278f2f3b1d99adc6 SHA256 82e2084a795ee9b08b0524229f28a4a44b7343273edd7fb120aaf7f0eb85f7ca
AUX twinkle.desktop.patch 250 RMD160 788925b507d7fcfb8456bbef6dade0e9dae31c7e SHA1 510f834035f698f805514ea1bde0f5703d1736f7 SHA256 c384de5a69863d6dddbfc8f4376fb2e7ac6fa18acc3ba55676d02ef69f90f600
DIST twinkle-1.0.1.tar.gz 1256457 RMD160 094aa44f014427ff919831e4fa02976736390a8d SHA1 d8894d803e2cc08e181cd71001a4f5e0fa9434ef SHA256 91beee47027d25c746acf92afd4cb3efbe906c005dbb929b496dd31b6b9d3b99
DIST twinkle-1.3.1.tar.gz 1505752 RMD160 69e90cd14a407c3b9986ca9a585697a8b43e9e3e SHA1 6b0c1f2bcd3fa04e873686d63e5387766152c79b SHA256 eba60ee98a0c8845234c76785aa451971aa1851bc98353b682a3afbdb5180f12
-DIST twinkle-1.4.tar.gz 1577409 RMD160 9e632f6f682fe44fdfd8f2fc5ebcf51025e5623e SHA1 724b974596f5f725cce9a899a725e8b1f734f16e SHA256 7b6f55386f35f0a84f3b15ed39825962a65304d0142d8aaaca5005e00cfe3523
+DIST twinkle-1.4.1.tar.gz 1577865 RMD160 e8b9777b020a21c1ea0b2680db810eeea85d6af3 SHA1 a65ce2ff0176d38d1275d4367b297234fac684d3 SHA256 ea5d1eb1b1127d1bc63a33b2682f95cecbf252e81d4dba16969dd63856aa169e
EBUILD twinkle-1.0.1-r1.ebuild 1753 RMD160 da820bce962fc6b862a3fa059d7ee97a8a4cb7a3 SHA1 181c742cc6a27319f45821bb9b846b1edf0c7c9b SHA256 69146ff8234349b94ce01386dce4f677c8ac97963b34809bc6f5a19280406956
EBUILD twinkle-1.3.1.ebuild 1504 RMD160 887fa9780ead20052ee8b8b4d068f4fb70661caa SHA1 bd8f906e6cf60171cad4c712b6384c300b46ce31 SHA256 d4b368a244522d8113df7aefeb8813598a967199f59d65fe1cf4532655510a86
-EBUILD twinkle-1.4.ebuild 1427 RMD160 17ea2091ed98bc11607f6c45c0a82a3af85f64f6 SHA1 4ea29ff5b906e6162171753820cea32697b1dfbf SHA256 3f68ff6c9ae9099faece6614b6ef1edefbdc0a56b45768358c87b3b8aa6ce266
-MISC ChangeLog 8480 RMD160 20a46f6d0b71c9546b8721692b24267202ad8aac SHA1 13e17a4133be6baad4031052b587654ebb2ba744 SHA256 a3f87cce5cd93e8e8809702d486a3d01e654795d200eddfdc75d657ccd393817
+EBUILD twinkle-1.4.1.ebuild 1499 RMD160 cb35dde7c8b44c17259a1a82a26ab00f28758826 SHA1 f2add2826a6f185be7186688b20dfcbfb5babc98 SHA256 a2095db6d5ad3eff10960846bdac8cdf9945bedf0aa288472846946091b89d63
+MISC ChangeLog 8787 RMD160 f41b7feba4686dccc372192711165ec21cef9e0e SHA1 820ceb690a5a3cc0e962125f74bcceccf2fbb6c7 SHA256 168ff09d8ca35561d360e99a69a1e4fd76b6c6b47d32ef781009a63cfcbdcb26
MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6
diff --git a/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch b/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch
new file mode 100644
index 000000000000..cee696e33d81
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch
@@ -0,0 +1,24 @@
+diff -ur twinkle-1.4.1-orig/acinclude.m4 twinkle-1.4.1/acinclude.m4
+--- twinkle-1.4.1-orig/acinclude.m4 2007-11-27 14:43:29.000000000 -0600
++++ twinkle-1.4.1/acinclude.m4 2009-02-01 10:58:17.000000000 -0600
+@@ -1780,7 +1780,7 @@
+ kde_check_header="ksock.h"
+ kde_check_lib="libkdecore.la"
+ else
+- kde_check_header="ksharedptr.h"
++ kde_check_header="ksock.h"
+ kde_check_lib="libkio.la"
+ fi
+
+diff -ur twinkle-1.4.1-orig/configure.in twinkle-1.4.1/configure.in
+--- twinkle-1.4.1-orig/configure.in 2009-01-30 22:48:30.000000000 -0600
++++ twinkle-1.4.1/configure.in 2009-02-01 10:41:56.000000000 -0600
+@@ -159,7 +159,7 @@
+ KDE_SET_PREFIX
+ AC_PATH_KDE
+
+- AC_CHECK_FILES(${kde_includes}/kapplication.h,
++ AC_CHECK_FILES(${kde_includes}/ksystemtray.h,
+ [],
+ [AC_MSG_ERROR([kde header files missing (kdelibs3-devel package)])])
+ AC_DEFINE(HAVE_KDE, 1, [Define to 1 if you have KDE.])
diff --git a/net-im/twinkle/twinkle-1.4.ebuild b/net-im/twinkle/twinkle-1.4.1.ebuild
index a6f484ff0b40..010df0746aa4 100644
--- a/net-im/twinkle/twinkle-1.4.ebuild
+++ b/net-im/twinkle/twinkle-1.4.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.ebuild,v 1.1 2009/01/27 17:57:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.1.ebuild,v 1.1 2009/02/15 12:54:20 dragonheart Exp $
-EAPI=1
+EAPI=2
ARTS_REQUIRED="never"
-inherit eutils qt3 kde
+inherit eutils qt3 kde autotools
DESCRIPTION="a soft phone for your VOIP communcations using SIP"
HOMEPAGE="http://www.twinklephone.com/"
@@ -37,7 +37,12 @@ pkg_setup() {
fi
}
-src_compile() {
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-kdedetect.patch
+ eautoreconf
+}
+
+src_configure() {
local myconf=" \
$(use_with kde) \
$(use_with ilbc) \
@@ -45,11 +50,10 @@ src_compile() {
$(use_with zrtp) \
$(use_with speex)"
set-kdedir
- kde_src_compile
}
src_install() {
kde_src_install
- dodoc THANKS
domenu twinkle.desktop
+ dodoc THANKS
}