old

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

7 files changed, 15 insertions, 317 deletions

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index 0691cdc35923..61055bc9362f 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/amsn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.113 2011/10/23 16:05:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.114 2011/10/23 16:26:45 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/amsn-0.97.2-TkCximage.patch, -files/amsn-0.97.2-http-fix.patch,
+  -files/amsn-0.97_rc1-nostrip.patch, -amsn-0.98.3.ebuild, -amsn-0.98.4.ebuild:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> amsn-0.98.3.ebuild,
   amsn-0.98.4.ebuild, amsn-0.98.4-r1.ebuild:
diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index 2af8f42e3c21..a2e5845adfd6 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX amsn-0.97.2-TkCximage.patch 3451 RMD160 ecb50e3e98e8c0142c12a11be2345069286fbbba SHA1 be3c392d856ff7150f437c6419a6dd63f40e92dc SHA256 51b02012d51ad981d307f8b816aa783214a9b7811198136ef0fc1bd68ed5a8fc
-AUX amsn-0.97.2-http-fix.patch 771 RMD160 10eb6467d140e84ae8bc1726013b1630b1af78ff SHA1 12793ccdcfcaab341c515dbee991e5d4d5ce246b SHA256 9caa3e9b439f690114e4dc7609221dba3d662e857233208cc9e44009209d6b1c
-AUX amsn-0.97_rc1-nostrip.patch 281 RMD160 9276deedc6df1ea49031a11e61b171a7739703b4 SHA1 00e23dae355531073cb5317d64c1a5703b703981 SHA256 309684e00439feaee29240f59b486bbcd895bbfb057da99b1d06c6c57d98929d
 AUX amsn-0.98-noautoupdate.patch 1371 RMD160 ea2b1ca3dfda02b07be649973d273ec0eccb53a1 SHA1 6d472886ab0d9a218000f17bdcbf4fc143a37baa SHA256 e4ffbe486dd48b72e8a5fda212c76a800b760e2b9dab22c34df280cb544274af
 AUX amsn-0.98.4-amsnplus-ldflags.patch 452 RMD160 54d0f8c4cfc5b13e225d9fbd3426ad3d5a928613 SHA1 6d9dd12ec2bd2cc35f5e3effa74b00f7405f05ef SHA256 8c91329a99585153e353cfef73601b073337fc2306adeed0725fa7c1e2dccb6b
 AUX amsn-0.98.4-libpng15.patch 16533 RMD160 52e068036a76805218663ee4cf4726a59806f30e SHA1 1f048d24dc52bdb8efbecfb275d64717903e5829 SHA256 4b13cf0e00978f72323790ea872a331241145ab4a9ac8649d25a4d07cbe2bab9
 AUX amsn-0.98.4-v4l2.patch 850 RMD160 8657bd6e05cb42ebc702e9863274a4755878bb57 SHA1 0838d1e15953cf413351c36fdfcc9e2ee88e709c SHA256 67b2e5c212ba91c5dedb4e82a14cf53ea6f1aa81dd1de879953f8378d66bbbe4
-DIST amsn-0.98.3-src.tar.bz2 13275477 RMD160 20f707062da4a5ab1eb6beec49d01dfd2ba90a99 SHA1 aa8383a11ce66352aceee27f9c291c1410b3403d SHA256 43b76da9d886fd2cdcf8a7e21c9872141228a2ad1defaca8ad537722a32e0d88
 DIST amsn-0.98.4-src.tar.bz2 13513233 RMD160 8e0c3bdde902540fe759b01978447cc60d8fbeb3 SHA1 e00761c945ad47e0b715c69f1f9f18f5a4bf287c SHA256 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871
-EBUILD amsn-0.98.3.ebuild 1871 RMD160 9f0c98cbcf01e99489a3c9685e2f4b796003d872 SHA1 9c6fd87cc4862f6cc8520059fcd72674b9600b65 SHA256 43a9d319b635f083efeea543b542075066960c81eb17789b145668eed8f514b0
 EBUILD amsn-0.98.4-r1.ebuild 2259 RMD160 d19aa10040d17d29a5b74a40b2f7974aafba4052 SHA1 b10c9582f8d6151ed0caebe17181a0bc8fae1328 SHA256 62399abb48dd0bd10e6365e0a914b732cc8029a97ad00b71ad88e230e3cf0cea
-EBUILD amsn-0.98.4.ebuild 1869 RMD160 2532009c9b08ae4813a700016fa29c44c2d2a81b SHA1 493df4b7dfe0ede898c0362bb56f09804f19cbd1 SHA256 d61a651406c147de75f1a31790984900ce21c6fb8efcddc7d0dad28bc8a52256
-MISC ChangeLog 14384 RMD160 b7ddcdd5221c78ddf6a26fda5b9b9975a133e869 SHA1 a1bb84b0b2574a9355cd3c6a1972f3e852193820 SHA256 9f7ad9f4b5bc2ec8ba5c8a18d3aa5c68de3ea5582b17e673f8d8c58dab45ec02
+MISC ChangeLog 14600 RMD160 a68a8741242ead28c769a2ab3a36e38ea6cc02ab SHA1 8f897c67ece2775d18ce2a6eabcf4088b4cb7f6f SHA256 9fafa755a976b94c28630bb37e61977b0df937e74ea0662a618dbd4e9941d51c
 MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kO0YACgkQuQc30/atMkBvlQCfcqUPb4hso9cW+xgTbokFgKzL
-GHUAni1TvY/ERda+yybgms7rnp+glbPr
-=dEET
+iQEcBAEBAgAGBQJOpEAYAAoJEEdUh39IaPFN2iEH+wdBFqs19TpCv0g+H01bv19S
+T2YbijUGpeTPOblcylcBfXY7z0rocQ2h6I/26nHzZmWDFaf1LbzSLrnwcOixoyVl
+bmVUL6KBH2ihDnUk4scDEOUBZEhyUVhCZBAoq/+IniV2KmPELIvfhSN7dOG59oTm
+gkJ6tCITq9KKetng+uX7PrlpnF9qdfTY8U9dmdcxoQTeQjsGoQ11vTlQolBNvXlb
+1D1NC8W3IohcaXlYcUh3Z2hiBWIq2e81n8Tyh7eQltacezVoYiIGAGtNaZWglWeu
+wS4iK53x+tNGnEy7aQ/JI8ROJqcOd4GMVZr77gWjx4/WGqoGrjMx6qtxA3z0Nt4=
+=6n/t
 -----END PGP SIGNATURE-----
diff --git a/net-im/amsn/amsn-0.98.3.ebuild b/net-im/amsn/amsn-0.98.3.ebuild
deleted file mode 100644
index 3e0e73e458c1..000000000000
--- a/net-im/amsn/amsn-0.98.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.3.ebuild,v 1.9 2011/10/23 16:05:20 armin76 Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime gnome2-utils
-
-MY_P=${P/_rc/RC}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Alvaro's Messenger client for MSN"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://www.amsn-project.net"
-
-# The tests are interactive
-RESTRICT="test"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc -sparc x86"
-IUSE="debug"
-
-DEPEND=">=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4
-	virtual/jpeg
-	media-libs/libpng
-	>=dev-tcltk/snack-2.2.10
-	>=net-libs/gupnp-igd-0.1.3
-	media-libs/libv4l"
-#	>=net-libs/farsight2-0.0.14
-#	>=media-libs/gstreamer-0.10.23
-#	>=media-libs/gst-plugins-base-0.10.23
-
-RDEPEND="${DEPEND}
-	>=dev-tcltk/tls-1.5
-	virtual/ffmpeg[encode]"
-#	>=media-libs/gst-plugins-good-0.10.15
-#	>=media-libs/gst-plugins-bad-0.10.13
-#	>=media-plugins/gst-plugins-ffmpeg-0.10.7
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.98-noautoupdate.patch"
-	# only portage should strip files, bug 285682
-	sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf $(use_enable debug) || die "configure script failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AGREEMENT TODO README FAQ CREDITS
-
-	domenu amsn.desktop
-	sed -i -e s:.png:: "${D}/usr/share/applications/amsn.desktop"
-
-	cd desktop-icons
-	for i in *; do
-		if [ -e ${i}/msn.png ]; then
-			insinto /usr/share/icons/hicolor/${i}/apps
-			doins  ${i}/msn.png
-		fi
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "You might have to remove ~/.amsn prior to running as user if amsn hangs on start-up."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/amsn/amsn-0.98.4.ebuild b/net-im/amsn/amsn-0.98.4.ebuild
deleted file mode 100644
index 3557fdb55296..000000000000
--- a/net-im/amsn/amsn-0.98.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4.ebuild,v 1.4 2011/10/23 16:05:20 armin76 Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime gnome2-utils
-
-MY_P=${P/_rc/RC}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="aMSN Messenger client"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://www.amsn-project.net"
-
-# The tests are interactive
-RESTRICT="test"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc -sparc ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4
-	virtual/jpeg
-	media-libs/libpng
-	>=dev-tcltk/snack-2.2.10
-	>=net-libs/gupnp-igd-0.1.3
-	media-libs/libv4l"
-#	>=net-libs/farsight2-0.0.14
-#	>=media-libs/gstreamer-0.10.23
-#	>=media-libs/gst-plugins-base-0.10.23
-
-RDEPEND="${DEPEND}
-	>=dev-tcltk/tls-1.5
-	virtual/ffmpeg[encode]"
-#	>=media-libs/gst-plugins-good-0.10.15
-#	>=media-libs/gst-plugins-bad-0.10.13
-#	>=media-plugins/gst-plugins-ffmpeg-0.10.7
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.98-noautoupdate.patch"
-	# only portage should strip files, bug 285682
-	sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf $(use_enable debug) || die "configure script failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AGREEMENT TODO README FAQ CREDITS
-
-	domenu amsn.desktop
-	sed -i -e s:.png:: "${D}/usr/share/applications/amsn.desktop"
-
-	cd desktop-icons
-	for i in *; do
-		if [ -e ${i}/msn.png ]; then
-			insinto /usr/share/icons/hicolor/${i}/apps
-			doins  ${i}/msn.png
-		fi
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "You might have to remove ~/.amsn prior to running as user if amsn hangs on start-up."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/amsn/files/amsn-0.97.2-TkCximage.patch b/net-im/amsn/files/amsn-0.97.2-TkCximage.patch
deleted file mode 100644
index 33c5edb4ea14..000000000000
--- a/net-im/amsn/files/amsn-0.97.2-TkCximage.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- trunk/amsn/utils/TkCximage/src/TkCximage.cpp	2008/10/03 21:20:28	10549
-+++ trunk/amsn/utils/TkCximage/src/TkCximage.cpp	2008/12/28 21:50:08	10818
-@@ -26,6 +26,65 @@
- char currenttime[30];
- FILE * logfile;
- 
-+#define AVAILABLE_FORMATS 6
-+Tk_PhotoImageFormat cximageFormats[] = {
-+  {
-+    "cximage",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  },
-+  {
-+    "cxgif",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  },
-+  {
-+    "cxpng",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  },
-+  {
-+    "cxjpg",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  },
-+  {
-+    "cxtga",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  },
-+  {
-+    "cxbmp",
-+    (Tk_ImageFileMatchProc *) ChanMatch,	
-+    (Tk_ImageStringMatchProc *) ObjMatch,	
-+    (Tk_ImageFileReadProc *) ChanRead,	
-+    (Tk_ImageStringReadProc *) ObjRead,	
-+    (Tk_ImageFileWriteProc *) ChanWrite,	
-+    (Tk_ImageStringWriteProc *) StringWrite
-+  }
-+};
-+  
-+  
- int RGB2BGR(Tk_PhotoImageBlock *data, BYTE * pixelPtr) {
-   int i;
-   int size = data->height * data->width * data->pixelSize;
-@@ -267,10 +326,6 @@
-   INITLOGS(); //
-   LOG("---------------------------------"); //
- 
--
--  int AvailableFromats = 6;
--  const char *KnownFormats[] = {"cximage", "cxgif", "cxpng", "cxjpg", "cxtga", "cxbmp"};
--
-   //Check Tcl version is 8.3 or higher
-   if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-     return TCL_ERROR;
-@@ -285,15 +340,6 @@
- 
-   LOG("Tk stub initialized"); //
- 
--  Tk_PhotoImageFormat cximageFormats = {
--    NULL,
--    (Tk_ImageFileMatchProc *) ChanMatch,	
--    (Tk_ImageStringMatchProc *) ObjMatch,	
--    (Tk_ImageFileReadProc *) ChanRead,	
--    (Tk_ImageStringReadProc *) ObjRead,	
--    (Tk_ImageFileWriteProc *) ChanWrite,	
--    (Tk_ImageStringWriteProc *) StringWrite
--  };
- 	
-   LOG("Creating commands"); //
- 
-@@ -323,14 +369,9 @@
- #endif
- 
-   LOG("Adding format : "); //
--  for (i = 0; i < AvailableFromats; i++) {
--    delete cximageFormats.name;
--    cximageFormats.name = new char[strlen(KnownFormats[i]) + 1];
--    strcpy(cximageFormats.name, KnownFormats[i]);
--    Tk_CreatePhotoImageFormat(&cximageFormats);
--    APPENDLOG(cximageFormats.name); //
--    delete cximageFormats.name;
--    cximageFormats.name = NULL;
-+  for (i = 0; i < AVAILABLE_FORMATS; i++) {
-+    Tk_CreatePhotoImageFormat(&cximageFormats[i]);
-+    APPENDLOG(cximageFormats[i].name); //
-   }
- 
-   // end of Initialisation
diff --git a/net-im/amsn/files/amsn-0.97.2-http-fix.patch b/net-im/amsn/files/amsn-0.97.2-http-fix.patch
deleted file mode 100644
index d5b2d093db29..000000000000
--- a/net-im/amsn/files/amsn-0.97.2-http-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trunk/amsn/autoupdate.tcl	2008/03/11 20:50:28	9648
-+++ trunk/amsn/autoupdate.tcl	2008/11/14 16:47:29	10726
-@@ -540,7 +540,7 @@
- 	}
- 
- 	#///////////////////////////////////////////////////////////////////////
--	package require http
-+	package require -exact http 2.4.4
- 
- 	proc check_web_version { token } {
- 		global version rcversion weburl
---- trunk/amsn/proxy.tcl	2008/10/27 18:05:35	10649
-+++ trunk/amsn/proxy.tcl	2008/11/14 16:47:29	10726
-@@ -9,7 +9,7 @@
- ::Version::setSubversionId {$Id: amsn-0.97.2-http-fix.patch,v 1.1 2009/02/01 01:22:32 tester Exp $}
- 
- package provide Proxy 0.1
--package require http
-+package require -exact http 2.4.4
- 
- # This should be converted to a proper package, to use with package require
- source socks.tcl	;# SOCKS5 proxy support
diff --git a/net-im/amsn/files/amsn-0.97_rc1-nostrip.patch b/net-im/amsn/files/amsn-0.97_rc1-nostrip.patch
deleted file mode 100644
index 53a5a7d7229d..000000000000
--- a/net-im/amsn/files/amsn-0.97_rc1-nostrip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	2007-07-13 23:06:37.000000000 +0100
-+++ Makefile.in	2007-07-13 23:07:20.000000000 +0100
-@@ -107,11 +107,6 @@
- 	LDFLAGS := @LDFLAGS@
- endif
- 
--ifeq (@DEBUG@,no)
--	ifneq (@FOUND_OS@,mac)
--LDFLAGS += -s
--	endif
--endif
- X_LIBS  := @X_LIBS@
- CXX_LIB := @CXX_LIB@
-