5 files changed, 46 insertions, 31 deletions

diff --git a/net-p2p/eiskaltdc/Makefile b/net-p2p/eiskaltdc/Makefile
index c64f3a9f015f..d4f364dc5d51 100644
--- a/net-p2p/eiskaltdc/Makefile
+++ b/net-p2p/eiskaltdc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdc
-PORTVERSION=	1.0.30
+PORTVERSION=	1.0.40
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/net-p2p/eiskaltdc/distinfo b/net-p2p/eiskaltdc/distinfo
index 0f9748f43a41..0faee23a89b7 100644
--- a/net-p2p/eiskaltdc/distinfo
+++ b/net-p2p/eiskaltdc/distinfo
@@ -1,3 +1,3 @@
-MD5 (eiskaltdc-1.0.30.tar.bz2) = ab6f5987a90d2da65b85cad2c88667f4
-SHA256 (eiskaltdc-1.0.30.tar.bz2) = 03b94b247eb480531bf3485d7733790bbf524c8276a500469df13f69153670a6
-SIZE (eiskaltdc-1.0.30.tar.bz2) = 1627569
+MD5 (eiskaltdc-1.0.40.tar.bz2) = 031d2811b71d15e6894f2fe2eec061c3
+SHA256 (eiskaltdc-1.0.40.tar.bz2) = 697f906f64ffa7ba39a8be9ac47917591be19e283d45f2a91f5bfa2395c93e0d
+SIZE (eiskaltdc-1.0.40.tar.bz2) = 1691772
diff --git a/net-p2p/eiskaltdc/files/patch-CMakeLists.txt b/net-p2p/eiskaltdc/files/patch-CMakeLists.txt
index 1a489296b8cd..9bcd3e6a1cfa 100644
--- a/net-p2p/eiskaltdc/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdc/files/patch-CMakeLists.txt
@@ -1,33 +1,39 @@
 --- ./eiskaltdc/CMakeLists.txt.orig	2009-10-23 02:33:43.000000000 +1100
 +++ ./eiskaltdc/CMakeLists.txt	2009-11-06 16:51:20.000000000 +1000
-@@ -384,7 +384,7 @@
- 		)
- 	MESSAGE (STATUS "Build svn revision: ${SVNVERSION}")
- ENDIF (NOT DEFINED SVNVERSION)
+@@ -253,7 +253,7 @@
+ IF (NOT SVNVERSION)
+     SET (SVNVERSION "release")
+ ENDIF (NOT SVNVERSION)
 -#CONFIGURE_FILE(eiskaltdc-1.1.0.pc.cmake.in ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc)
 +CONFIGURE_FILE(eiskaltdc-1.1.0.pc.cmake.in ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc)
  CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/config.h)
  # actual targets:
  IF (UNIX)
-@@ -447,9 +447,9 @@
- 	INSTALL (DIRECTORY icons/appl icons/emot icons/user DESTINATION ${EISKALT_ICONS_DEST} PATTERN ".svn" EXCLUDE)
- 	INSTALL (FILES ${FLAG} DESTINATION ${EISKALT_ICONS_DEST}/appl/default )
- 	INSTALL (DIRECTORY sounds/ DESTINATION ${EISKALT_SOUNDS_DEST} PATTERN ".svn" EXCLUDE
--	PATTERN "Makefile.am" EXCLUDE)
-+	PATTERN "Makefile.am" EXCLUDE PATTERN "Makefile.in" EXCLUDE)
- 	INSTALL (FILES ../COPYING DESTINATION share/eiskaltdc)
--	#INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
-+	INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
- 	INSTALL (FILES icons/icon_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME eiskaltdc.png)
- 	INSTALL (FILES icons/icon_64x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME eiskaltdc.png)
- 	INSTALL (FILES icons/icon_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME eiskaltdc.png)
-@@ -460,7 +460,7 @@
- 	INSTALL (FILES icons/icon_128x128.png DESTINATION share/pixmaps/ RENAME eiskaltdc.png)
+@@ -286,7 +286,7 @@
+         INSTALL (TARGETS eiskalt eiskaltdc
+         RUNTIME DESTINATION bin
+         LIBRARY DESTINATION ${LIBDIR}
+-        NAMELINK_SKIP)
++        )
+         #INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc/libeiskaltdcstatic.a DESTINATION lib RENAME libeiskaltdc.a)
+         INSTALL (FILES ${COMPILED_TRANSLATIONS} DESTINATION ${EISKALT_TRANSLATIONS_DEST})
+         INSTALL (DIRECTORY icons/appl icons/emot icons/user DESTINATION ${EISKALT_ICONS_DEST} PATTERN ".svn" EXCLUDE)
+@@ -294,7 +294,7 @@
+         INSTALL (DIRECTORY sounds/ DESTINATION ${EISKALT_SOUNDS_DEST} PATTERN ".svn" EXCLUDE
+         PATTERN "Makefile.*" EXCLUDE)
+         INSTALL (FILES ../COPYING DESTINATION share/eiskaltdc)
+-        #INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
++        INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
+         INSTALL (FILES icons/icon_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME eiskaltdc.png)
+         INSTALL (FILES icons/icon_64x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME eiskaltdc.png)
+         INSTALL (FILES icons/icon_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME eiskaltdc.png)
+@@ -305,7 +305,7 @@
+         INSTALL (FILES icons/icon_128x128.png DESTINATION share/pixmaps/ RENAME eiskaltdc.png)
  IF (UNIX)
- 	INSTALL (FILES ../eiskaltdc.desktop DESTINATION share/applications RENAME eiskaltdc.desktop)
--	INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION share/man/man1)
--	#INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION include/pkgconfig)
-+	INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION man/man1)
-+	INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION libdata/pkgconfig)
+         INSTALL (FILES ../eiskaltdc.desktop DESTINATION share/applications RENAME eiskaltdc.desktop)
+-        INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION share/man/man1)
+-        #INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION include/pkgconfig)
++        INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION man/man1)
++        INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION libdata/pkgconfig)
  ENDIF (UNIX)
  
diff --git a/net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in b/net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in
index 8d78426e93d5..a7c02c03e5ff 100644
--- a/net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in
+++ b/net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in
@@ -1,11 +1,11 @@
 --- ./eiskaltdc/docs/en/Makefile.in.orig	2009-08-25 22:23:16.000000000 +0400
 +++ ./eiskaltdc/docs/en/Makefile.in	2009-09-09 21:46:47.000000000 +0400
-@@ -349,8 +349,6 @@
+@@ -371,8 +371,6 @@
  	uninstall uninstall-am
  
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
 -	$(INSTALL_DATA) $(srcdir)/eiskaltdc.1 $(DESTDIR)$(mandir)/man1/
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net-p2p/eiskaltdc/pkg-plist b/net-p2p/eiskaltdc/pkg-plist
index 4c281cb3830e..12188a358969 100644
--- a/net-p2p/eiskaltdc/pkg-plist
+++ b/net-p2p/eiskaltdc/pkg-plist
@@ -15,7 +15,9 @@ include/eiskaltdc/dceditserver.h
 include/eiskaltdc/dcedittransfer.h
 include/eiskaltdc/dcevent.h
 include/eiskaltdc/dcfilebrowser.h
-include/eiskaltdc/dcfilebrowseritems.h
+include/eiskaltdc/dcfilebrowserhistory.h
+include/eiskaltdc/dcfilebrowsersearchengine.h
+include/eiskaltdc/dcfilehasher.h
 include/eiskaltdc/dcfilelistdecompressor.h
 include/eiskaltdc/dcfiletool.h
 include/eiskaltdc/dcfiletransferinfo.h
@@ -48,11 +50,12 @@ include/eiskaltdc/dctranslator.h
 include/eiskaltdc/dcusercommandeditor.h
 include/eiskaltdc/dcuserslist.h
 include/eiskaltdc/dcwidget.h
+include/eiskaltdc/filebrowsermodel.h
 include/eiskaltdc/filteronlyproxy.h
+include/eiskaltdc/hublistmodel.h
 include/eiskaltdc/ipfiltermodel.h
 include/eiskaltdc/publichubsmodel.h
 include/eiskaltdc/publichubsproxy.h
-include/eiskaltdc/search-result-columns.h
 include/eiskaltdc/searchresultmodel.h
 include/eiskaltdc/searchspymodel.h
 include/eiskaltdc/userlistmodel.h
@@ -129,6 +132,9 @@ share/applications/eiskaltdc.desktop
 %%DATADIR%%/icons/appl/default/folder_blue_open.png
 %%DATADIR%%/icons/appl/default/folder_red.png
 %%DATADIR%%/icons/appl/default/globe.png
+%%DATADIR%%/icons/appl/default/go-next.png
+%%DATADIR%%/icons/appl/default/go-previous.png
+%%DATADIR%%/icons/appl/default/go-up.png
 %%DATADIR%%/icons/appl/default/gui.png
 %%DATADIR%%/icons/appl/default/help.png
 %%DATADIR%%/icons/appl/default/icon_appl.png
@@ -155,6 +161,7 @@ share/applications/eiskaltdc.desktop
 %%DATADIR%%/icons/appl/default/reload_plugins.png
 %%DATADIR%%/icons/appl/default/save.png
 %%DATADIR%%/icons/appl/default/server.png
+%%DATADIR%%/icons/appl/default/slots_up.png
 %%DATADIR%%/icons/appl/default/sort-down-arrow.png
 %%DATADIR%%/icons/appl/default/spam.png
 %%DATADIR%%/icons/appl/default/splash.png
@@ -170,6 +177,8 @@ share/applications/eiskaltdc.desktop
 %%DATADIR%%/icons/appl/default/users.png
 %%DATADIR%%/icons/appl/default/users_22x22.png
 %%DATADIR%%/icons/appl/default/users_32x32.png
+%%DATADIR%%/icons/appl/default/view-list-details.png
+%%DATADIR%%/icons/appl/default/view-list-icons.png
 %%DATADIR%%/icons/appl/default/view_sidetree.png
 %%DATADIR%%/icons/appl/default/vru.png
 %%DATADIR%%/icons/appl/default/windows_cl_all.png