old

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 1 insertions, 280 deletions

diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 73857910e663..9485ecc697b1 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,9 +1,6 @@
-AUX licq-1.3.6-glibc-2.10.patch 6864 RMD160 807108dcaaec5dfa3cbee446c3a4967bd1189194 SHA1 48014f3e1ede20b7b3e90c0f8e8e610f8ea5517a SHA256 70131d3a3cc6c4b3d3a87c05465ab0b946458d5de03ea5bcd46728dbbf78e211
 AUX licq-1.3.8-hebrew.patch 2092 RMD160 b9891b2131fa91c28a842cd8e9c256154b898ad4 SHA1 b74a3f3ebebf117e25eaacf8671ae5f368ffb07a SHA256 64b6cceed8cdf7142e692b26ca68df37b9ebda38801c2a014310735447331715
 AUX licq-1.3.8-memory_leak.patch 267 RMD160 d00622806241db927568945dce4c996d41bf8c72 SHA1 5bc19377d7895249af11fb4f9d8e52f5818298ad SHA256 a079b61345444ba20e3c8388259fab0e607e03562327f556ffe2037c9a92b92e
-DIST licq-1.3.6.tar.bz2 4777777 RMD160 0d626640e02c9991309d6f7c32725cd1d5bdfa37 SHA1 1451da41c82b9a13424c96d8641e642895b723ac SHA256 ad6ea66301923e5d106111a6b4654aaa72131d8b5c499d16dc9fbbc8cd29845e
 DIST licq-1.3.8.tar.bz2 4500623 RMD160 07900d5d7bbd7154c5569468a709ed9a63ac83c8 SHA1 3cd6ccf8b584dff7803a639da82c3bed7fafdbac SHA256 fb65cd5447f2771def5cffda113d68b25ee6ed6fe0ebce84638da79e2869ebc6
-EBUILD licq-1.3.6.ebuild 3062 RMD160 efd76f3af698deaf98b1b4b16750c2dc32635b38 SHA1 62afcd0b25e2f069510aa4b53b9d50d608e34cbd SHA256 66c450ddc7fc63ee75575c87ed5475d98bdba3276bcbf187bc48c5b7248c5f11
 EBUILD licq-1.3.8-r1.ebuild 2124 RMD160 77d536dbd5c5d70606685643d7038767a757d31e SHA1 9923d8cd7a6ff91faf47141b62af5370102ef06d SHA256 8f2834f487687e80865acc02b696860091b1d9cdee9d9f0fa9f12038510183e3
 MISC ChangeLog 18011 RMD160 a0062a4b8a89ad23b420083554ec8b99563424d6 SHA1 078b63a4dd579f230f073c204ce09a2e2f63a9da SHA256 c28c3f3a5b426df57903f45d3467de178c98f345eebe50c2b0423614eb61ee4e
-MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
+MISC metadata.xml 248 RMD160 32b68d3a6c121ed600e06d0d05a8c2594bbe649f SHA1 db89c22c9f4ccf23b92e4f9229c72ea93ac1418d SHA256 1f7b982a641b8778e31e3339b18ba24df592a3cef59b9b85174218c55c98e5e1
diff --git a/net-im/licq/files/licq-1.3.6-glibc-2.10.patch b/net-im/licq/files/licq-1.3.6-glibc-2.10.patch
deleted file mode 100644
index d732baf324e3..000000000000
--- a/net-im/licq/files/licq-1.3.6-glibc-2.10.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -ur licq-1.3.6.orig/plugins/msn/src/msn-sb.cpp licq-1.3.6/plugins/msn/src/msn-sb.cpp
---- licq-1.3.6.orig/plugins/msn/src/msn-sb.cpp	2008-08-17 16:34:41.000000000 +0300
-+++ licq-1.3.6/plugins/msn/src/msn-sb.cpp	2009-08-07 14:40:22.000000000 +0300
-@@ -441,7 +441,7 @@
-   const char *szParam = strServer.c_str();
-   char szServer[16];
-   char *szPort;
--  if ((szPort = strchr(szParam, ':')))
-+  if ((szPort = const_cast<char*> (strchr(szParam, ':'))))
-   {
-     strncpy(szServer, szParam, szPort - szParam);
-     szServer[szPort - szParam] = '\0';
-@@ -504,7 +504,7 @@
-   const char *szParam = strServer.c_str();
-   char szServer[16];
-   char *szPort;
--  if ((szPort = strchr(szParam, ':')))
-+  if ((szPort = const_cast<char*> (strchr(szParam, ':'))))
-   {
-     strncpy(szServer, szParam, szPort - szParam);
-     szServer[szPort - szParam] = '\0';
-diff -ur licq-1.3.6.orig/plugins/msn/src/msn-srv.cpp licq-1.3.6/plugins/msn/src/msn-srv.cpp
---- licq-1.3.6.orig/plugins/msn/src/msn-srv.cpp	2008-08-11 19:06:38.000000000 +0300
-+++ licq-1.3.6/plugins/msn/src/msn-srv.cpp	2009-08-07 14:41:08.000000000 +0300
-@@ -76,7 +76,7 @@
-         const char *szParam = strServer.c_str();
-         char szNewServer[16];
-         char *szPort;
--        if ((szPort = strchr(szParam, ':')))
-+        if ((szPort = const_cast<char*> (strchr(szParam, ':'))))
-         {
-           strncpy(szNewServer, szParam, szPort - szParam);
-           szNewServer[szPort - szParam] = '\0';
-diff -ur licq-1.3.6.orig/plugins/msn/src/msn-ssl.cpp licq-1.3.6/plugins/msn/src/msn-ssl.cpp
---- licq-1.3.6.orig/plugins/msn/src/msn-ssl.cpp	2008-09-07 17:03:53.000000000 +0300
-+++ licq-1.3.6/plugins/msn/src/msn-ssl.cpp	2009-08-07 14:41:37.000000000 +0300
-@@ -68,7 +68,7 @@
-   if (strFirstLine == "HTTP/1.1 200 OK")
-   {
-     m_pSSLPacket->ParseHeaders();
--    char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
-+    const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
-     char *tag;
- 
-     if (fromPP == 0)
-@@ -76,7 +76,7 @@
-     else
-     {
-       fromPP+= 9; // skip to the tag
--      char *endTag = strchr(fromPP, '\'');
-+      const char *endTag = strchr(fromPP, '\'');
-       tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
-     }
- 
-@@ -146,7 +146,7 @@
- 
-   m_pNexusBuff->ParseHeaders();
-   
--  char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
-+  const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
-   szLogin += 8; // skip to the tag
-   //char *szEndURL = strchr(szLogin, '/');
-   //char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need
-diff -ur licq-1.3.6.orig/src/file.cpp licq-1.3.6/src/file.cpp
---- licq-1.3.6.orig/src/file.cpp	2008-09-13 16:58:45.000000000 +0300
-+++ licq-1.3.6/src/file.cpp	2009-08-07 14:43:57.000000000 +0300
-@@ -569,7 +569,7 @@
-   }
-   else
-   {
--    if ((szPostEquals = strchr(_szLine, '=')) == NULL)
-+    if ((szPostEquals = const_cast<char*> (strchr(_szLine, '='))) == NULL)
-     {
-        Warn(INI_ExFORMAT, _szLine);
-        return NULL;
-diff -ur licq-1.3.6.orig/src/icqd-filetransfer.cpp licq-1.3.6/src/icqd-filetransfer.cpp
---- licq-1.3.6.orig/src/icqd-filetransfer.cpp	2008-07-25 23:34:44.000000000 +0300
-+++ licq-1.3.6/src/icqd-filetransfer.cpp	2009-08-07 14:45:06.000000000 +0300
-@@ -106,7 +106,7 @@
-   struct stat buf;
- 
-   // Remove any path from the filename
--  if ( (pcNoPath = strrchr(_szFileName, '/')) != NULL)
-+  if ( (pcNoPath = const_cast<char*> (strrchr(_szFileName, '/'))) != NULL)
-     m_szFileName = strdup(pcNoPath + 1);
-   else
-     m_szFileName = strdup(_szFileName);
-diff -ur licq-1.3.6.orig/src/icqpacket.cpp licq-1.3.6/src/icqpacket.cpp
---- licq-1.3.6.orig/src/icqpacket.cpp	2008-08-23 19:04:35.000000000 +0300
-+++ licq-1.3.6/src/icqpacket.cpp	2009-08-07 14:29:38.000000000 +0300
-@@ -5874,7 +5874,7 @@
-   }
- 
-   // Remove path from filename (if it exists)
--  char *pcEndOfPath = strrchr(_szFilename, '/');
-+  const char *pcEndOfPath = strrchr(_szFilename, '/');
-   if (pcEndOfPath != NULL)
-      m_szFilename = strdup(pcEndOfPath + 1);
-   else
-diff -ur licq-1.3.6.orig/src/licq.cpp licq-1.3.6/src/licq.cpp
---- licq-1.3.6.orig/src/licq.cpp	2008-06-11 21:34:35.000000000 +0300
-+++ licq-1.3.6/src/licq.cpp	2009-08-07 14:32:52.000000000 +0300
-@@ -183,14 +183,14 @@
- /*-----Helper functions for CLicq::UpgradeLicq-----------------------------*/
- int SelectUserUtility(const struct dirent *d)
- {
--  char *pcDot = strrchr(d->d_name, '.');
-+  const char *pcDot = strrchr(d->d_name, '.');
-   if (pcDot == NULL) return (0);
-   return (strcmp(pcDot, ".uin") == 0);
- }
- 
- int SelectHistoryUtility(const struct dirent *d)
- {
--  char *pcDot = strchr(d->d_name, '.');
-+  const char *pcDot = strchr(d->d_name, '.');
-   if (pcDot == NULL) return (0);
-   return (strcmp(pcDot, ".history") == 0 ||
-           strcmp(pcDot, ".history.removed") == 0);
-diff -ur licq-1.3.6.orig/src/rtf.cc licq-1.3.6/src/rtf.cc
---- licq-1.3.6.orig/src/rtf.cc	2007-06-21 00:41:54.000000000 +0300
-+++ licq-1.3.6/src/rtf.cc	2009-08-07 14:38:41.000000000 +0300
-@@ -2141,7 +2141,7 @@
-         return;
-     }
-     if (m_bFontName){
--        char *pp = strchr(str, ';');
-+        const char *pp = strchr(str, ';');
-         unsigned size = strlen(pp);
-         if (pp){
-             size = (pp - str);
-diff -ur licq-1.3.6.orig/src/rtf.ll licq-1.3.6/src/rtf.ll
---- licq-1.3.6.orig/src/rtf.ll	2007-06-21 00:41:54.000000000 +0300
-+++ licq-1.3.6/src/rtf.ll	2009-08-07 14:38:27.000000000 +0300
-@@ -541,7 +541,7 @@
-         return;
-     }
-     if (m_bFontName){
--        char *pp = strchr(str, ';');
-+        const char *pp = strchr(str, ';');
-         unsigned size = strlen(pp);
-         if (pp){
-             size = (pp - str);
-diff -ur licq-1.3.6.orig/src/translate.cpp licq-1.3.6/src/translate.cpp
---- licq-1.3.6.orig/src/translate.cpp	2008-07-02 17:02:49.000000000 +0300
-+++ licq-1.3.6/src/translate.cpp	2009-08-07 14:36:18.000000000 +0300
-@@ -76,7 +76,7 @@
- bool CTranslator::setTranslationMap(const char* mapFileName)
- {
-   // Map name is the file name with no path
--  char* sep = strrchr(mapFileName, '/');
-+  const char* sep = strrchr(mapFileName, '/');
-   const char* mapName = (sep == NULL ? mapFileName : sep + 1);
- 
-   if (strcmp(mapName, "LATIN_1") == 0)
-diff -ur licq-1.3.6.orig/src/utility.cpp licq-1.3.6/src/utility.cpp
---- licq-1.3.6.orig/src/utility.cpp	2008-07-25 23:34:44.000000000 +0300
-+++ licq-1.3.6/src/utility.cpp	2009-08-07 14:34:28.000000000 +0300
-@@ -46,7 +46,7 @@
- //=====CUtilityManager==========================================================
- int SelectUtility(const struct dirent *d)
- {
--  char *pcDot = strrchr(d->d_name, '.');
-+  const char *pcDot = strrchr(d->d_name, '.');
-   if (pcDot == NULL) return (0);
-   return (strcmp(pcDot, ".utility") == 0);
- }
diff --git a/net-im/licq/licq-1.3.6.ebuild b/net-im/licq/licq-1.3.6.ebuild
deleted file mode 100644
index 6eeed04c27d5..000000000000
--- a/net-im/licq/licq-1.3.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.12 2009/12/25 20:20:05 ssuominen Exp $
-
-EAPI="1"
-
-CMAKE_USE_DIR="${S}/plugins/qt4-gui"
-inherit eutils qt3 multilib cmake-utils
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="crypt debug msn ncurses nls qt3 qt4 socks5 ssl xosd"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	qt3? ( x11-libs/qt:3 )
-	qt4? ( x11-libs/qt-gui:4 )
-	nls? ( sys-devel/gettext )
-	ncurses? ( sys-libs/ncurses dev-libs/cdk )
-	crypt? ( app-crypt/gpgme:1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
-
-_generate_plugins_directories() {
-	PLUGINS="auto-reply email rms"
-	use msn && PLUGINS="${PLUGINS} msn"
-	use ncurses && PLUGINS="${PLUGINS} console"
-	use xosd &&  PLUGINS="${PLUGINS} osd"
-	# QT4 is something extra. Uses cmake.
-	use qt4 && PLUGINS_CMAKE="${PLUGINS_CMAKE} qt4-gui"
-	use qt3 && PLUGINS="${PLUGINS} qt-gui"
-	elog "I will generate these plugins/frontends for licq:"
-	elog "${PLUGINS} ${PLUGINS_CMAKE}"
-}
-
-pkg_setup() {
-	_generate_plugins_directories
-}
-
-src_compile() {
-	local myconf myconf2 plugin
-	# global config setup for automake
-	myconf="$(use_enable crypt gpgme)
-		$(use_enable ssl openssl)
-		$(use_enable socks5)
-		$(use_enable debug)
-		$(use_enable nls)"
-
-	einfo "Compiling Licq core."
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-
-	for plugin in ${PLUGINS}; do
-		cd "${S}"/plugins/"${plugin}"
-		einfo "Compiling Licq: \"${plugin}\"."
-		if use qt3; then
-			myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)"
-		fi
-		econf ${myconf} ${myconf2} || die "econf failed"
-		emake || die "emake failed"
-	done
-	# we like qt4 it uses cmake
-	if use qt4; then
-		einfo "Compiling Licq: \"qt4-gui\"."
-		# Possible error because of one tiny issue we introduce in kde
-		# it is called kdeprefix and in that case you can't be sure where it
-		# find kde stuff. This is working only for -kdeprefix so someone will
-		# need to fix this later
-		# kde not yet workie
-		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	# install core
-	einfo "Installing Licq core."
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README* doc/*
-	# Install the plug-ins
-	for plugin in ${PLUGINS}; do
-		cd "${S}"/plugins/"${plugin}"
-		einfo "Installing Licq: \"${plugin}\"."
-		emake DESTDIR="${D}" install || die "emake install failed"
-		dodoc README* *.conf
-	done
-	if use qt4; then
-		einfo "Installing Licq: \"qt4-gui\"."
-		cmake-utils_src_install
-		docinto plugins/qt4-gui
-		# Hack only for 1.3.6. Fixed in 1.3.8.
-		mv -f "${D}"/usr/lib/licq/licq_qt4-gui.so \
-			"${D}"/usr/$(get_libdir)/licq/licq_qt4-gui.so
-	fi
-
-	exeinto /usr/share/${PN}/upgrade
-	doexe "${S}"/upgrade/*
-
-	# fixes bug #22136 and #149464
-	rm -fR "${D}"/var
-}
diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml
index 17d6694798be..2d3b94c99ae6 100644
--- a/net-im/licq/metadata.xml
+++ b/net-im/licq/metadata.xml
@@ -4,4 +4,3 @@
 <herd>net-im</herd>
 <longdescription>Licq is an ICQ clone with an extensive plugin system.</longdescription>
 </pkgmetadata>
-