Version bump to boinc 6.12.26. Drop older. Update tarballs to be lzma compressed.

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

6 files changed, 89 insertions, 24 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 9618f743fb4d..00374e5fa6a5 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.95 2011/05/21 19:34:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.96 2011/05/22 09:22:59 scarabeus Exp $
+
+*boinc-6.12.26 (22 May 2011)
+
+  22 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/6.12.26-fix_subdirs.patch, +files/6.12.26-libnotify-0.7.patch,
+  -boinc-6.10.58-r1.ebuild, +boinc-6.12.26.ebuild, files/generate_tarball.sh:
+  Version bump to boinc 6.12.26. Drop older. Update tarballs to be lzma
+  compressed.
 
   21 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.conf,
   files/boinc.init:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 3e7e17e10601..24ea03a83118 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 6.12.26-fix_subdirs.patch 1042 RMD160 567805fcc0d88a53fb051e7e00d0ef179522b689 SHA1 c11069357e2af66f89eea602233ac8dcf529de71 SHA256 a424a53df0f3154bd4ae305493ef512646e882944349c5e1e98d305f614c685d
+AUX 6.12.26-libnotify-0.7.patch 745 RMD160 1e084a3e85cbff42568786119feec11f5f99b926 SHA1 fcba9cbd9df6a69a4e634e0c093b7203e34d6804 SHA256 948337c2489030cfdda1f30b8cffbe4e38b9e8865e70cfcf1747338008b9a56c
 AUX boinc.conf 440 RMD160 eb56e84e0bb56d033fb1b8ff692343eb22fd6877 SHA1 7560db67952b01152f69f3caa5511d267533cc33 SHA256 bf989320e14597fc24d54a24881dafec8a141075a7da71138ca32771d66c6713
 AUX boinc.init 2810 RMD160 567d400589df0325fcaa47fca4b484d54ec35544 SHA1 85ddacd9b63ab5e95684a2b0c29c62cda441c0e6 SHA256 6860d82c1a60596f4e1db37f2b1f6b3387710060be8c1fa8f914e95263bdbd7b
-AUX generate_tarball.sh 3416 RMD160 dbf729a669586beab2d79e6f4fb1c246ad778808 SHA1 b7c8aa1f08971d8e5cfa8e2543f4d8ffc83c69ba SHA256 e5ee6e3801bd5d699da6d8acb297b076d11dab61fb6e42263720bf1393bfcafc
-DIST boinc-6.10.58.tar.bz2 11599121 RMD160 f38eeaead419fdc56d406a2293d1d2c66deed61d SHA1 cba4cefffa1aaf562ef85d1b2555de4ba28255d1 SHA256 70199b0c820bf0a40d9ec54c1be2115a5cf447f4baacc7c3b67175bca7240f42
-EBUILD boinc-6.10.58-r1.ebuild 3692 RMD160 cf4298261e3ce4338a7ee4512380a18f5f9a1b98 SHA1 e46dda58d0e7f16f9450dfe6442fb9e17109dd4f SHA256 2cb2e189e5251e8c2b84d229e9afe8c0ca678dcf563af3899129ef50871b86df
-MISC ChangeLog 17527 RMD160 e771c014c72399ddb8603931cb5e990eaa9b6918 SHA1 3dded36c68486b52c7dc2af65cf4e1dec3171c46 SHA256 db6898a588424f8c1256bb9db076260111fe945696095cc4fc416fbc4f9f8250
+AUX generate_tarball.sh 3414 RMD160 ac7a0611303e1ed9a84817f94403059bcad097ed SHA1 0b4912213e3cb0bd25f51d57f0f60b7a9bf542e8 SHA256 c0cd0631ffa19ed5937fdda32527e76f7495a2e5b740adb0fbe3c936fab03bb9
+DIST boinc-6.12.26.tar.xz 9480644 RMD160 f10aeb0ee9450de7a0d256fdb41def4c67d71c4d SHA1 ce9467578453cf0cd9cd07ab5f2167eeabdb706b SHA256 7efb391ccd37777d89f31b12e3f00343b3a7d250be7d1de960ef4a57f41c49fb
+EBUILD boinc-6.12.26.ebuild 3869 RMD160 4433712972d0bf86951c19dc826dab2ed5741f7e SHA1 2de9e1f6bb457a397a876d18ca500ad0a008de25 SHA256 11c460041dbeb8994bbf8f5b3ef039974fa795e175760f542c05f35cf1e95bf2
+MISC ChangeLog 17849 RMD160 4c5180f32fe4d6be723f1df6cca0472ce93b012a SHA1 49ec1fee1385b323d72b54e3b0f7e86b47f1faa1 SHA256 514fb6fc9947d58491a9f32f53e034a398413196467e28662507bd1ff3ed97cd
 MISC metadata.xml 774 RMD160 a5a2ec0c50667b20da393a2a18e63fcdc94e2eb0 SHA1 16e144f257f88c1cb7ce996aec900709096ce048 SHA256 c9024478fda0e26c17e3f324090e33dd0954cc0397802dd9872a9bdf1f733e6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3YE68ACgkQHB6c3gNBRYcrdwCgznMrkdPM817fw9kH83o8TZ6u
-RbIAoM4AXYLKW19IcPZK/K47oY9h9y8W
-=HttZ
+iEYEARECAAYFAk3Y1fgACgkQHB6c3gNBRYcuNgCgonQX87Ugombwa3dj+yMaYpfL
+mcQAn1ekFSiBliM33KxxSRcsQHfm3mad
+=T9Xl
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.10.58-r1.ebuild b/sci-misc/boinc/boinc-6.12.26.ebuild
index 0f5bd631f25f..b1da70fd3037 100644
--- a/sci-misc/boinc/boinc-6.10.58-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.12.26.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.58-r1.ebuild,v 1.3 2010/11/08 17:52:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.26.ebuild,v 1.1 2011/05/22 09:22:59 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit flag-o-matic depend.apache eutils wxwidgets autotools autotools-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X +client cuda"
+IUSE="X cuda"
 
 RDEPEND="
 	!sci-misc/boinc-bin
@@ -30,14 +30,24 @@ RDEPEND="
 	X? (
 		dev-db/sqlite:3
 		media-libs/freeglut
+		sys-libs/glibc:2.2
 		virtual/jpeg
+		x11-libs/gtk+:2
+		x11-libs/libnotify
 		x11-libs/wxGTK:2.8[X,opengl]
 	)
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook2X
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_subdirs.patch"
+	"${FILESDIR}/${PV}-libnotify-0.7.patch"
+)
+
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
@@ -55,10 +65,11 @@ src_prepare() {
 
 src_configure() {
 	local wxconf=""
-	local conf=""
 
 	# define preferable CFLAGS (recommended by upstream)
 	append-flags -O3 -funroll-loops -fforce-addr -ffast-math
+	# add gtk includes
+	append-flags "$(pkg-config --cflags gtk+-2.0)"
 
 	# look for wxGTK
 	if use X; then
@@ -69,19 +80,16 @@ src_configure() {
 		wxconf+=" --without-wxdir"
 	fi
 
-	conf+=" --disable-server"
-	use X || conf+=" --disable-manager"
-	use client || conf+=" --disable-client"
-
-	# configure
 	myeconfargs=(
-		--disable-dependency-tracking
+		--disable-server
+		--enable-client
+		--enable-dynamic-client-linkage
 		--disable-static
 		--enable-unicode
 		--with-ssl
 		$(use_with X x)
+		$(use_enable X manager)
 		${wxconf}
-		${conf}
 	)
 	autotools-utils_src_configure
 }
diff --git a/sci-misc/boinc/files/6.12.26-fix_subdirs.patch b/sci-misc/boinc/files/6.12.26-fix_subdirs.patch
new file mode 100644
index 000000000000..a0ea5ab0cc60
--- /dev/null
+++ b/sci-misc/boinc/files/6.12.26-fix_subdirs.patch
@@ -0,0 +1,26 @@
+diff -urN boinc-6.12.26.old//configure.ac boinc-6.12.26//configure.ac
+--- boinc-6.12.26.old//configure.ac	2011-05-22 09:40:36.392051762 +0200
++++ boinc-6.12.26//configure.ac	2011-05-22 11:03:28.687889510 +0200
+@@ -887,7 +887,6 @@
+                  apps/Makefile
+                  clientgui/Makefile
+                  clientgui/res/Makefile
+-                 clientscr/Makefile
+                  client/Makefile
+                  client/win/boinc_path_config.py:py/boinc_path_config.py.in
+                  client/scripts/Makefile
+diff -urN boinc-6.12.26.old//Makefile.am boinc-6.12.26//Makefile.am
+--- boinc-6.12.26.old//Makefile.am	2011-05-22 09:40:36.376051962 +0200
++++ boinc-6.12.26//Makefile.am	2011-05-22 11:03:16.277044666 +0200
+@@ -21,10 +21,7 @@
+ endif
+ 
+ if ENABLE_MANAGER
+-	CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
+-	if BUILD_X11_SCREENSAVER
+-		CLIENTGUI_SUBDIRS += clientscr
+-	endif 
++   CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
+ endif
+ 
+ # ORDER MATTERS below.  One must build dependencies FIRST, then things
diff --git a/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch b/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch
new file mode 100644
index 000000000000..da6e729fc6fc
--- /dev/null
+++ b/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch
@@ -0,0 +1,21 @@
+diff -urN boinc-6.12.26.old/clientgui/gtk/taskbarex.cpp boinc-6.12.26/clientgui/gtk/taskbarex.cpp
+--- boinc-6.12.26.old/clientgui/gtk/taskbarex.cpp	2011-05-22 09:40:36.314052737 +0200
++++ boinc-6.12.26/clientgui/gtk/taskbarex.cpp	2011-05-22 11:20:06.838410909 +0200
+@@ -226,12 +226,11 @@
+ 

+     if (!g_pNotification)

+     {

+-        g_pNotification = 

+-            notify_notification_new_with_status_icon(

+-                title.mb_str(),

+-                message.mb_str(),

+-                desired_icon,

+-                g_pStatusIcon

++        g_pNotification =

++			notify_notification_new(

++				title.mb_str(),

++				message.mb_str(),

++				gtk_status_icon_get_icon_name(g_pStatusIcon)

+         );

+ 

+         g_signal_connect(

diff --git a/sci-misc/boinc/files/generate_tarball.sh b/sci-misc/boinc/files/generate_tarball.sh
index a6cc4d8868ab..6a15be5a937b 100644
--- a/sci-misc/boinc/files/generate_tarball.sh
+++ b/sci-misc/boinc/files/generate_tarball.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-## $Id: generate_tarball.sh,v 1.1 2010/04/02 09:48:24 scarabeus Exp $
+## $Id: generate_tarball.sh,v 1.2 2011/05/22 09:22:59 scarabeus Exp $
 ## Modified by scarabeus 2008-10-23
 ###############################################################################
 # functions
@@ -83,8 +83,8 @@ popd > /dev/null
 ###############################################################################
 # create tbz
 ###############################################################################
-tar cjf "${PACKAGE}".tar.bz2 ${PACKAGE} >> "${LOG}"
-find ./ -maxdepth 1 -type f -name \*.tar.bz2 -print | while read FILE ; do
+tar cJf "${PACKAGE}".tar.xz ${PACKAGE} >> "${LOG}"
+find ./ -maxdepth 1 -type f -name \*.tar.xz -print | while read FILE ; do
 	echo "FILE: ${FILE}"
 	echo "      SIZE: $(`which du` -h ${FILE} |`which awk` -F' ' '{print $1}')"
 	echo "    MD5SUM: $(`which md5sum` ${FILE} |`which awk` -F' ' '{print $1}')"