Version bump to the latest. Drop older. Fixes bug #374329.

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

3 files changed, 30 insertions, 28 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index f2e95dd53282..201e972e00cb 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2011/05/27 06:32:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.102 2011/07/11 21:15:22 scarabeus Exp $
+
+*boinc-6.12.33 (11 Jul 2011)
+
+  11 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -boinc-6.12.26-r1.ebuild, +boinc-6.12.33.ebuild:
+  Version bump to the latest. Drop older. Fixes bug #374329.
 
   27 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> boinc-6.12.26-r1.ebuild:
   Make the dep on libnotify versioned so even suckers that do not update wont
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index abbf87849af7..4c1e2275899f 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -6,14 +6,14 @@ AUX 6.12.26-libnotify-0.7.patch 745 RMD160 1e084a3e85cbff42568786119feec11f5f99b
 AUX boinc.conf 376 RMD160 af3ad95f091f00982c5e761e67f885d00a080634 SHA1 dc4054c55858c1b6c8679e88449507c3f59b19a5 SHA256 286f5f11e54a73b41ebf1e35aae1db4c2c3e249a3bfce755ced84c8c1b361cc9
 AUX boinc.init 2614 RMD160 c28a2b796679be199c44867932143cdcd5357302 SHA1 52f95b9900e33757ae47a1a6eb2aa219170983f6 SHA256 b4fa57d26cb6b71f4c04bea25b18f08b1cc2b83258daed4156e8dddee5401135
 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-r1.ebuild 3878 RMD160 99b75e9df78106612087e7620a136aff8f7b5929 SHA1 fcd93c321c6fd9eea7a5897edf99bc3ccd5135b2 SHA256 c13ed37f3a9fb1451a6f1c83198ab79dc87b6f0995fe44aa0ed5e951ae35b98c
-MISC ChangeLog 18617 RMD160 d17fef6e9fbc74497a695efcef67ddff8698ada1 SHA1 c1d7265f57caf2473d73534fc5201113a8a4f105 SHA256 b39d4f15aae9ee1c1e636e447c0a30e9c7c11aa5164458569e775f0e24825768
+DIST boinc-6.12.33.tar.xz 10364104 RMD160 e3c6ced3c1b93c22aafd86d1650e0ce4a0b49bb4 SHA1 e3297a613a8f1c326eeb2c82a38ff7f086b33bf4 SHA256 161ffaee03c2c201c67777e4ed2ca99118963ffa0eaa4797ac3ad0f45ee1bfbc
+EBUILD boinc-6.12.33.ebuild 3708 RMD160 d685bc5ed6cb266795e495677477ce6c51480263 SHA1 c53efee7aa39cce91c8a089094c6b75649b49a5a SHA256 d94915ae1b6ffca06a1001c6c2fb2f9792f31f807e9930f6991746173eddbc76
+MISC ChangeLog 18815 RMD160 cc9bfa4c0102942151136a714135033f84d5e3ac SHA1 960255a2b16acac5ed04494b9d99b9a6ef06ca9e SHA256 684a9f703adc58d187edf6ddcc88596204326ec31354308e334f5b62e67f08a7
 MISC metadata.xml 574 RMD160 97ce5bcbca5607c119a2d0484fc228a870594ac7 SHA1 ddf921ef095def89299edfcd0350082de356366a SHA256 76e1da0a34c62e7a78db5b796b64af9da51bf31c159498c147c8d0546be79571
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3fRWsACgkQHB6c3gNBRYek7ACfW5IRy9hKb9NWZN3NLlrzQVGd
-WO4AoL/g5U/5c1pPOr8wioSvAcJLycMO
-=Jy/3
+iEYEARECAAYFAk4bZ7EACgkQHB6c3gNBRYer3gCfc33BFi+jlOvqTgyDTEF+EZ7K
+dugAn16EZAoG61BzlENTQc6PHdY1f5Wv
+=mHXL
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.12.26-r1.ebuild b/sci-misc/boinc/boinc-6.12.33.ebuild
index 0666ac048005..933ba84e9453 100644
--- a/sci-misc/boinc/boinc-6.12.26-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.12.33.ebuild
@@ -1,10 +1,10 @@
 # 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.12.26-r1.ebuild,v 1.2 2011/05/27 06:32:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.33.ebuild,v 1.1 2011/07/11 21:15:22 scarabeus Exp $
 
 EAPI=4
 
-inherit flag-o-matic depend.apache eutils wxwidgets autotools autotools-utils
+inherit flag-o-matic eutils wxwidgets autotools base
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -44,8 +44,8 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PV}-fix_subdirs.patch"
-	"${FILESDIR}/${PV}-libnotify-0.7.patch"
+	"${FILESDIR}/6.12.26-fix_subdirs.patch"
+	"${FILESDIR}/6.12.26-libnotify-0.7.patch"
 )
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -53,12 +53,12 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 src_prepare() {
 	# use system ssl certificates
 	mkdir "${S}"/curl
-	cp /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
+	ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
 
 	# prevent bad changes in compile flags, bug 286701
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
-	autotools-utils_src_prepare
+	base_src_prepare
 
 	eautoreconf
 }
@@ -66,8 +66,6 @@ src_prepare() {
 src_configure() {
 	local wxconf=""
 
-	# 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)"
 
@@ -80,23 +78,21 @@ src_configure() {
 		wxconf+=" --without-wxdir"
 	fi
 
-	myeconfargs=(
-		--disable-server
-		--enable-client
-		--enable-dynamic-client-linkage
-		--disable-static
-		--enable-unicode
-		--with-ssl
-		$(use_with X x)
-		$(use_enable X manager)
+	econf \
+		--disable-server \
+		--enable-client \
+		--enable-dynamic-client-linkage \
+		--disable-static \
+		--enable-unicode \
+		--with-ssl \
+		$(use_with X x) \
+		$(use_enable X manager) \
 		${wxconf}
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 
 	dodir /var/lib/${PN}/
 	keepdir /var/lib/${PN}/