dev-util/icewing: Moved to virtual/jpeg, make it compile with gcc46

svn path=/sunrise/; revision=11986

5 files changed, 100 insertions, 14 deletions

diff --git a/dev-util/icewing/Manifest b/dev-util/icewing/Manifest
index 81d010a36..a8b058121 100644
--- a/dev-util/icewing/Manifest
+++ b/dev-util/icewing/Manifest
@@ -1,5 +1,7 @@
+AUX icewing-0.10-gcc64.patch 1650 RMD160 56a96359fe6f36c922f40f27cfe8971e8dcd42b3 SHA1 aaf1333ce8959788e75049be57dfe9c4048f69ca SHA256 cfd90139b55a079b2699f26bcda9d16dc2d2c58c19ab6ab3419ca16518b861a8
+AUX icewing-0.10-mandir.patch 535 RMD160 cd70371e5382cea7fe9d72b8f9d9baf62f9041b6 SHA1 46faf11b47ee3e4c26fb26bb5203d0361bea0be8 SHA256 df55776a94aa07b833544e19bff1b253208070eb5100b86d6589594a5e0e147f
 DIST icewing-0.10.tar.bz2 2371444 RMD160 e3befeef15a66f7f5256c7e7d0aed45a1c03929d SHA1 52c8e5ae1beec25f39f451fe4281a92f036fbde3 SHA256 efadb08d28d58fd7f835de8d99b3e2425a65a7e4a4b8c4bfb440bbed46552764
-EBUILD icewing-0.10.ebuild 1426 RMD160 6e4c055a1c8666bf557f722ca4e0fb415aef94f0 SHA1 29bd0d7188e7370ac602c099bfe7f4fafca64c74 SHA256 1c40a6f2c9f371b2dad9d30356202252dab95901e4a09a6951b2f3e59e3f1d97
-EBUILD icewing-9999.ebuild 1463 RMD160 a6ee8c2a610d710d1e2dfae02806f1fce44976c6 SHA1 6fc0b7386bb970779c926c46dbad2392930e2a30 SHA256 4612696f223310e6db12754341736aa95336854e0aa31204afeb33b17e97a9a8
+EBUILD icewing-0.10.ebuild 1505 RMD160 e868b7679198817ebe4c7a919092de47a01d368e SHA1 c8ebe77f1fe45a7af05ff6aaf70f12402b829452 SHA256 6dc5c94b2cf5db989b6595f5316727767acd7f9b22c815b1f741bd7c177fc400
+EBUILD icewing-9999.ebuild 1463 RMD160 81473b9550678e75d77285bf29625d0f3cabd767 SHA1 6a3b935b4709d9a98bf17cac6a43897a6efe83d4 SHA256 a456a9ea4b847390f4d3c5ed5eb7a16ebe4a2b38d6da8870be0176d953229ae6
 MISC ChangeLog 554 RMD160 ab13e384d242053ce08de9db5ac8ad1066bce642 SHA1 521d3557978cf0a07b9328a414e5edbf5bd1285b SHA256 43d0fc62e9aa6c5a307cdf76001bc3e68c713207399c585fd569d1ecef07ea74
 MISC metadata.xml 598 RMD160 899c3d1ad27f4557ab12f208b0ac4f86bd247fd8 SHA1 a02040748034e3d2036e69ecb5f5496c64dff867 SHA256 1e93385239e17c6f21a8525b34d78186cba004f61786a526af75907d254e48b9
diff --git a/dev-util/icewing/files/icewing-0.10-gcc64.patch b/dev-util/icewing/files/icewing-0.10-gcc64.patch
new file mode 100644
index 000000000..88ac8722f
--- /dev/null
+++ b/dev-util/icewing/files/icewing-0.10-gcc64.patch
@@ -0,0 +1,61 @@
+--- iceWing/trunk/utils/icewing-control.cpp	2009/04/22 23:03:36	1955
++++ iceWing/trunk/utils/icewing-control.cpp	2010/02/10 23:26:07	1987
+@@ -700,7 +700,6 @@
+ 
+ int main (int argc, char **argv)
+ {
+-	char name[256], *line, *s;
+ 	int interactive = TRUE;
+ 	char *optarg;
+ 	int n;
+@@ -796,26 +795,25 @@
+ 	if (sock_name) {
+ 		struct hostent *he;
+ 		struct sockaddr_in addr;
+-		const char *name = strdup (sock_name);
+-		char *pname;
++		char *name = strdup (sock_name);
++		char *portname;
+ 		int port = SOCK_PORT;
+ 
+ 		/* Get destination host and port */
+-		if ((pname = strchr (name, ':'))) {
++		if ((portname = strchr (name, ':'))) {
+ 			char *pend = NULL;
+-			*pname++ = '\0';
+-			port = strtol (pname, &pend, 10);
++			*portname++ = '\0';
++			port = strtol (portname, &pend, 10);
+ 			if (!pend || *pend) {
+ 				fprintf (stderr, "Port specifier from option '-p' is not an int.\n");
+ 				help();
+ 			}
+ 		}
+-		if (!*name)
+-			name = SOCK_NAME;
+-		if ((he = gethostbyname (name)) == NULL) {
++		if ((he = gethostbyname (*name ? name:SOCK_NAME)) == NULL) {
+ 			herror (PRGNAME": gethostbyname()");
+ 			exit (1);
+ 		}
++		free (name);
+ 		fprintf (stderr, "Connecting to %s:%d...\n", he->h_name, port);
+ 
+ 		/* Connect to the destination */
+@@ -835,6 +833,7 @@
+ 
+ #ifdef WITH_DACS
+ 	if (dacs_name) {
++		char name[50];
+ 		sprintf (name, "iwCtrl%d", getpid());
+ 		if ( (dacs_entry = dacs_register (name)) == NULL) {
+ 			fprintf (stderr, PRGNAME": Can't register as '%s'!", name);
+@@ -878,6 +877,8 @@
+ 
+ 	/* Loop reading and executing lines until the user quits. */
+ 	while (!prg_exit) {
++		char *line, *s;
++
+ 		line = readline (PROMPT"> ");
+ 		if (!line) break;
+ 
diff --git a/dev-util/icewing/files/icewing-0.10-mandir.patch b/dev-util/icewing/files/icewing-0.10-mandir.patch
new file mode 100644
index 000000000..14f388124
--- /dev/null
+++ b/dev-util/icewing/files/icewing-0.10-mandir.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 615690c..5c83900 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+ SET(BINDIR "${PREFIX}/bin")
+ SET(INCLUDEDIR_B "${PREFIX}/include")
+ SET(INCLUDEDIR "${INCLUDEDIR_B}/${PACKET}")
+-SET(MANDIR "${PREFIX}/man")
++SET(MANDIR "${PREFIX}/share/man")
+ SET(LIBDIR_B "${PREFIX}/lib")
+ SET(LIBDIR "${LIBDIR_B}/${PACKET}")
+ SET(DATADIR "${PREFIX}/share/${PACKET}")
diff --git a/dev-util/icewing/icewing-0.10.ebuild b/dev-util/icewing/icewing-0.10.ebuild
index 99237c7e9..36a5c7761 100644
--- a/dev-util/icewing/icewing-0.10.ebuild
+++ b/dev-util/icewing/icewing-0.10.ebuild
@@ -7,7 +7,7 @@ EAPI="2"
 inherit cmake-utils
 
 DESCRIPTION="Integrated Communication Environment Which Is Not Gesten"
-HOMEPAGE="http://icewing.sf.net"
+HOMEPAGE="http://icewing.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -16,16 +16,22 @@ KEYWORDS="~amd64 ~x86"
 # need to add xcf, dacs, mvimpact as use-flags (and packages)
 IUSE="debug ffmpeg +grabber ieee1394 jpeg png readline +unicap"
 
-DEPEND="ieee1394? ( sys-libs/libraw1394 media-libs/libdc1394:2 )
+DEPEND="
+	sys-libs/zlib
+	x11-libs/gtk+:2[jpeg?]
 	ffmpeg? ( media-video/ffmpeg )
-	jpeg? ( media-libs/jpeg )
+	ieee1394? ( sys-libs/libraw1394 media-libs/libdc1394:2 )
+	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )
-	unicap? ( media-libs/unicap )
 	readline? ( sys-libs/readline )
-	sys-libs/zlib
-	x11-libs/gtk+:2[jpeg?]"
+	unicap? ( media-libs/unicap )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc64.patch
+	"${FILESDIR}"/${P}-mandir.patch
+	)
+
 src_configure() {
 	local mycmakeargs="
 		-DDEBUG:BOOL=$(use debug && echo ON || echo OFF)
diff --git a/dev-util/icewing/icewing-9999.ebuild b/dev-util/icewing/icewing-9999.ebuild
index 5853304b4..cdf8657c7 100644
--- a/dev-util/icewing/icewing-9999.ebuild
+++ b/dev-util/icewing/icewing-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="2"
 inherit cmake-utils subversion
 
 DESCRIPTION="Integrated Communication Environment Which Is Not Gesten"
-HOMEPAGE="http://icewing.sf.net"
+HOMEPAGE="http://icewing.sf.net/"
 SRC_URI=""
 
 ESVN_REPO_URI="http://icewing.svn.sourceforge.net/svnroot/icewing/iceWing/trunk"
@@ -18,14 +18,15 @@ KEYWORDS=""
 # need to add xcf, dacs, mvimpact as use-flags (and packages)
 IUSE="debug ffmpeg +grabber ieee1394 jpeg png readline +unicap"
 
-DEPEND="ieee1394? ( sys-libs/libraw1394 media-libs/libdc1394:2 )
+DEPEND="
+	sys-libs/zlib
+	x11-libs/gtk+:2[jpeg?]
 	ffmpeg? ( media-video/ffmpeg )
-	jpeg? ( media-libs/jpeg )
+	ieee1394? ( sys-libs/libraw1394 media-libs/libdc1394:2 )
+	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )
-	unicap? ( media-libs/unicap )
 	readline? ( sys-libs/readline )
-	sys-libs/zlib
-	x11-libs/gtk+:2[jpeg?]"
+	unicap? ( media-libs/unicap )"
 RDEPEND="${DEPEND}"
 
 src_configure() {