sci-misc/boinc-7.6 : Version bump and cleanup

8 files changed, 51 insertions, 365 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 9f74b3e..ec5c868 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*boinc-7.6 (14 Jan 2016)
+
+  14 Jan 2016; Sven Eden <yamakuzure@gmx.net>
+  +boinc-7.6.ebuild,
+  -boinc-7.2.0.ebuild
+  -boinc-7.2.0-r1.ebuild
+  -files/boinc-7.2-remove_boincscr.patch
+  -files/boinc-7.2-fix_subdirs.patch
+  -files/boincscr.desktop
+  -files/boincscr.xml
+  Version bump and removed obsolete versions and patches
+
+
   04 Nov 2014; Sven Eden <yamakuzure@gmx.net> +boinc-7.2.42.ebuild-r1,
   +files/boinc-7.2-remove_boincscr.patch
   +files/boincscr.desktop
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 87263b5..60fe814 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,11 +1,7 @@
-AUX boinc-7.2-fix_subdirs.patch 1323 SHA256 0a50f6bfc556e266852b0efeba98c2ed1421546506d7e53a88561601cb38ad79 SHA512 3361d8c7d42a31724129bc6259c02b9e1421218414f77320f7f991f7390b096d2bb9f53fed3a38c82469c6746bd830387d671e4ebabc8d2a9c9af723eb4f6452 WHIRLPOOL 478c3fbb6235e080909e0c1ccc8c251d2436a87a38ce6f267a5e2e0dce45a8d00c7f93b4e82d87fc8749fcc03102a920f86c04c4276bb42cff6c48f5f4e29624
-AUX boinc-7.2-remove_boincscr.patch 408 SHA256 2e89eed446c6f4bfa01a86215190a985db15191441f3321d213c2fd2b0434428 SHA512 083bd79a2c450156d9e9c437f653076bb41f51e12e25f2d1ad412406be0fe23ced114895a408b6e6de9c14571c75a1ec1aaa1cbde61b09768fcd32632358408c WHIRLPOOL 5bbc2ba34384c8dec11209d473b8b6986044732972f6e398026a89a542475b12ce3c2c5c274aa6820bafff06f342eb043976ca5bf1af190a398f1cde4f673040
 AUX boinc.conf 376 SHA256 286f5f11e54a73b41ebf1e35aae1db4c2c3e249a3bfce755ced84c8c1b361cc9 SHA512 5c28de999c4b32c0cdb096dd48d2ee22504c3cb60bacdbdc4a48c4967dac181060427f2912463e45ea109c49f1c6d6a9f9631844ef26687c75521926cf26677a WHIRLPOOL 05cc900fa19722185025df2fb09e0ad4e86c7bae01dc54dc2d43fd1a0d590de4e1bf15f8cf38c8e17f441d17db482ac7390bf35c61e92742cc05dda778656858
 AUX boinc.init 2640 SHA256 d15f25a8e53e1d94abd1f30eda1e49be497ebbfcd167facc40b7f46128e01d5c SHA512 481426c8bbb5b481c9298e816a9317bf1351dd59926f3e1a2a20b77aad3971cb8782797892d18459f8b3cab70fefe84a7731da1bdfa3ae0b2bcf120f4fa0b194 WHIRLPOOL fe398384b4b76d7cdb7dc732b8f44501b9433eeb925a3cd98a38ac0b7f0e9065cb0340d5869e1f0476842c76ada8817a6e8b3af56ec28ccf58c7a655f7e746ec
 AUX boinc.service 178 SHA256 3bcd2bdc65f7b6d9f568eeb63f54e7beaa2f0681f34bfd2d486cfd212fced105 SHA512 86a59b9096b19e6472781cb2a7229dd0540569666bcb5bedd83371e6264f1d6bee70e8b47216e1a5b6462726dcd3b54d86ba8de4478faab6c1792071b76abaf9 WHIRLPOOL 1c34aef20a8cdc0cb50a5b25c759cf622488dd2749945317f9f162a1ef1e8189b1f1069ea7be78528d1ee6454945f02f859b02359381e1d27240b796c5c0a85b
-AUX boincscr.desktop 808 SHA256 a11a18e4dbaf3050b584417e083bec6a81c326dbbc6659165609c62c7fb60ad9 SHA512 226e3427a537993a7b98ebb800ae27dddef5a26ffb4825b241e7dd9003eed6900e7759ab597fab57ef4a7ccc985caa3b02573fdffef1bd5abc923a2503eda8dd WHIRLPOOL a36e4941723342cf03d31e38d5aa40d6858d2e0affe688a417a43706b746a29a107aa62811e91bfb8e90f30751ae40b8dd743cc414dd39b914cae8c8f7c927b5
-AUX boincscr.xml 393 SHA256 f5a02e7608c2477675b3fe0d6b5b47bd12407212ad096a814833b52a60c47a50 SHA512 46ed4dd630f584c1394813f031eecdb41a8e30167ecfdd90b6c771c60f2b5e8d319dab9e8f8261459966a12ce6b39f99f21cefed33f731ee54333b14d44a494b WHIRLPOOL a27976c8198b1f8d8cef5e1de2098c087b9b798f9069add001c57d9c9e70a88b2466fec614af8d61fe1ba17d359e009fa09f0968ce15b5945ffe23ad012c5e17
-EBUILD boinc-7.2.42-r1.ebuild 4994 SHA256 d8fed4f039652c39eae5798e72a443584dcc443dead45d3f1b1ede9b165d86b7 SHA512 8205549ecd03fbc5ed75cdd6a690f00abb8d101c80aba39276741add74d974c247a3660f9b2ff6c311254e3a7d4b7dc5a7a66f325b58a5f8c3c8437e2e4e5fd8 WHIRLPOOL 8318d42e6ddaef1f738701a25292f383526eda5265d861d014b71c297dd50fc22dd7e6d22c306667863ef8e2fb9fb3595d15097b2e2c0d72f46390ea91b393b0
-EBUILD boinc-7.2.42.ebuild 3785 SHA256 d59cf85e7f4b20454dbfaaeb626d9dedce55e290d9721222d027f71ba63718ab SHA512 aabf7f8d0cb7ab4625f0c6943aa18912c8ad72abd9b60c4b33eb6b657223497cf3375f5d3c488a9cf6bb4e609a74a79bc638a5b69b6d94b645e002579cd526ae WHIRLPOOL fcf4b90571f6a40a5af426886d785f2c1f7587c754e436f6d6b95073e402ed4c2c7db5716c44f2e1ec2bc0e65dcf721d7de1070327bbda6a91f66cec249bdb51
-MISC ChangeLog 21504 SHA256 c06b2798e0c902a31cc4b757cd7dd6af593dfd144fa936d6f95e2cdbe1a74a37 SHA512 64c7236d8732160d433c8b89b956a2037f08c39b134498dac9b8365ccfec921119e0a4f9e10a752de7ed753722bbd604b3ee0438b5c586965a96f176208a93bb WHIRLPOOL a444fc3e1ed0adb1ed89af30be178bbe16d2da2bf46d94f41ecd5b6a0f596ab662d264975fe76df5880f305b3721bd778c138630b8eb774dfd492159924c3502
+DIST boinc-7.6.tar.gz 44311493 SHA256 dc819eb5d5c474e27e7e10c454568e2d0be8f84cdca6921d57f11825241d27e0 SHA512 35464f43e6200427fabd99a253e1b5050a47c53765fcde6b0c89dc1ecfcf6db50c755af509b8604a9aeac4ea9271d5160da2b82c77b178fabacaf879b8538c0b WHIRLPOOL 74fbf17ba7dda6617301a5ca091bba8e7bbc4a94828f620f5c72b2da813969441dc748bd62f8da14d513fceb9a70caf9019952d2a1c6fdb170ebe7cde7f5f5de
+EBUILD boinc-7.6.ebuild 3548 SHA256 af3d47094c343c957320423081b1bc6a87341be84ce631387e244cba52ebb347 SHA512 7e6dc0bd19f44fd35d6cb9f900a37ce03424cdde98b244acd06ce5b5b4ccb431d2776426369dbe7e6e1c47559872877bf1637f56f80b7ecc425a98c7334b50fc WHIRLPOOL b11fb0f82cbcfca854ad51bba5c7e16b78c5e0c7fbf30e2914a2b9cbf0bb16761c59399077f76929ec4be8bd45413294772d9d63ecba061241d504a702c0a0fe
+MISC ChangeLog 21829 SHA256 9d3178bf9b8aad5a713cae215677f1208a4efe62f0cc44b479bee32ca2ec5776 SHA512 8420c23a4e9ac75ac088bd0a3014f261ca5b24c05cf76b002e9e817deab8bf1c533f48625d123822a2e8a54750bff185dfdc15d038818834c131b2ec171a2b0b WHIRLPOOL bbb9b1eb8e38851251d7423d852bb90e7c816d9df99ac2052c10a825d1a2ad77965747403e8eacb382e9d0b5133c9bceff64c4b9c27f9feba85a99b61f69f66e
 MISC metadata.xml 699 SHA256 4ad2531267d8f0856b697e6fac37e3dc4783db75fc89cbd59aaf6d34080a6973 SHA512 46e0aeaf9f2750bbdd499106c9adf40210566af6335af158b15d7a4125c64ed4e0e8090e6c3bc0ab5744d2c4e35b8ea26fe62b64afddf2159db48931b758e45b WHIRLPOOL 3a42406e6fa1718e4e0af0de1e35637ff0cd67a2cd37b01d4acc9177cd27d19a853d7b04c5eb99540e5979e7d39e445d00fb9f2f4a9859c3676506fbdecec63b
diff --git a/sci-misc/boinc/boinc-7.2.42-r1.ebuild b/sci-misc/boinc/boinc-7.2.42-r1.ebuild
deleted file mode 100644
index 8a0e285..0000000
--- a/sci-misc/boinc/boinc-7.2.42-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic wxwidgets user versionator git-r3 systemd
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI=""
-
-EGIT_MIN_CLONE_TYPE="shallow"
-EGIT_REPO_URI="git://boinc.berkeley.edu/boinc-v2.git \
-    http://boinc.berkeley.edu/git/boinc-v2.git"
-EGIT_COMMIT="client_release/${MY_PV}/${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda kde static-libs suid systemd xscreensaver"
-
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl
-	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:2.8[X,opengl]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-vcs/git
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	# Fix subdirectory issues (remove unwanted directories)
-	epatch "${FILESDIR}"/${PN}-${MY_PV}-fix_subdirs.patch
-	
-	# Remove boincscr if it is not wanted
-	if ! use xscreensaver; then
-		epatch "${FILESDIR}"/${PN}-${MY_PV}-remove_boincscr.patch
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local wxconf=""
-
-	# add gtk includes
-	use X && append-flags "$(pkg-config --cflags gtk+-2.0)"
-
-	# look for wxGTK
-	if use X; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		wxconf+=" --with-wx-config=${WX_CONFIG}"
-	else
-		wxconf+=" --without-wxdir"
-	fi
-
-	local myeconfargs=(
-		--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
-
-	dodir /var/lib/${PN}/
-	keepdir /var/lib/${PN}/
-
-	if use X; then
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED}"/etc/
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/${PN}.service
-	fi
-	
-	# Get the screensaver working if wanted
-	if use xscreensaver; then
-		use suid && fperms 4755 /usr/bin/boincscr
-		dosym /usr/bin/boincscr /usr/$(get_libdir)/misc/xscreensaver/boincscr
-		insinto /usr/share/xscreensaver/config
-		doins "${FILESDIR}"/boincscr.xml
-		if use kde; then
-		    insinto /usr/share/kde4/services/ScreenSavers
-		    doins "${FILESDIR}"/boincscr.desktop
-		fi
-	fi
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	if use cuda; then
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video"
-	else
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use xscreensaver; then
-		local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
-
-		if [ -f ${xssconf} ]; then
-			sed -e '/*programs:/a\
-	GL: \"Boinc\"  boincscr -root -boinc_dir /var/lib/boinc    \\n\\' \
-				-i ${xssconf} || die "sed failed"
-		else
-			ewarn "$xssconf not found"
-		fi
-	
-	fi
-	
-	echo
-	elog "You are using the source compiled version of ${PN}."
-	use X && elog "The graphical manager can be found at /usr/bin/${PN}mgr"
-	elog
-	elog "You need to attach to a project to do anything useful with ${PN}."
-	elog "You can do this by running /etc/init.d/${PN} attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/${PN}/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/${PN}"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}
-
-pkg_postrm() {
-	if use xscreensaver; then
-		local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
-
-		if [ -f ${xssconf} ]; then
-			sed \
-                        -e '/\"Boinc\"  boincscr/d' \
-			-i ${xssconf} || die "sed failed"
-		else
-			ewarn "$xssconf not found"
-		fi
-	
-	fi
-}
\ No newline at end of file
diff --git a/sci-misc/boinc/boinc-7.2.42.ebuild b/sci-misc/boinc/boinc-7.6.ebuild
index 0f48acf..8e72da0 100644
--- a/sci-misc/boinc/boinc-7.2.42.ebuild
+++ b/sci-misc/boinc/boinc-7.6.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
+#WANT_AUTOMAKE="1.11"
+
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils flag-o-matic wxwidgets user versionator git-r3 systemd
+inherit autotools-utils eutils flag-o-matic systemd user versionator wxwidgets
 
-MY_PV=$(get_version_component_range 1-2)
+MY_PV=$(get_version_component_range 1)
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI=""
-
-EGIT_MIN_CLONE_TYPE="shallow"
-EGIT_REPO_URI="git://boinc.berkeley.edu/boinc-v2.git \
-    http://boinc.berkeley.edu/git/boinc-v2.git"
-EGIT_COMMIT="client_release/${MY_PV}/${PV}"
+SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda static-libs systemd"
+IUSE="X cuda static-libs"
 
 RDEPEND="
 	!sci-misc/boinc-bin
 	!app-admin/quickswitch
 	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl
+	dev-libs/openssl:0=
 	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
 	sys-apps/util-linux
 	sys-libs/zlib
@@ -40,24 +37,21 @@ RDEPEND="
 		dev-db/sqlite:3
 		media-libs/freeglut
 		sys-libs/glibc:2.2
-		virtual/jpeg
+		virtual/jpeg:0=
 		x11-libs/gtk+:2
 		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:2.8[X,opengl]
+		x11-libs/wxGTK:3.0[X,opengl,webkit]
 	)
 "
 DEPEND="${RDEPEND}
-	dev-vcs/git
 	sys-devel/gettext
 	app-text/docbook-xml-dtd:4.4
 	app-text/docbook2X
 "
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 
-PATCHES=(
-    "${FILESDIR}"/${PN}-${MY_PV}-fix_subdirs.patch
-)
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 	# prevent bad changes in compile flags, bug 286701
@@ -67,20 +61,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local wxconf=""
-
-	# add gtk includes
-	use X && append-flags "$(pkg-config --cflags gtk+-2.0)"
-
-	# look for wxGTK
-	if use X; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		wxconf+=" --with-wx-config=${WX_CONFIG}"
-	else
-		wxconf+=" --without-wxdir"
-	fi
-
 	local myeconfargs=(
 		--disable-server
 		--enable-client
@@ -90,24 +70,32 @@ src_configure() {
 		--with-ssl
 		$(use_with X x)
 		$(use_enable X manager)
-		${wxconf}
 	)
+
+	# look for wxGTK
+	if use X; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+		myeconfargs+=(--with-wx-config="${WX_CONFIG}")
+	else
+		myeconfargs+=(--without-wxdir)
+	fi
+
 	autotools-utils_src_configure
 }
 
 src_install() {
 	autotools-utils_src_install
 
-	dodir /var/lib/${PN}/
-	keepdir /var/lib/${PN}/
+	keepdir /var/lib/${PN}
 
 	if use X; then
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die
+		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
 		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
 	fi
 
 	# cleanup cruft
-	rm -rf "${ED}"/etc/
+	rm -rf "${ED}"/etc
 
 	newinitd "${FILESDIR}"/${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
@@ -118,29 +106,29 @@ pkg_preinst() {
 	enewgroup ${PN}
 	# note this works only for first install so we have to
 	# elog user about the need of being in video group
+	local groups="${PN}"
 	if use cuda; then
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video"
-	else
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+		group+=",video"
 	fi
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
 }
 
 pkg_postinst() {
 	echo
-	elog "You are using the source compiled version of ${PN}."
-	use X && elog "The graphical manager can be found at /usr/bin/${PN}mgr"
+	elog "You are using the source compiled version of boinc."
+	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
 	elog
-	elog "You need to attach to a project to do anything useful with ${PN}."
-	elog "You can do this by running /etc/init.d/${PN} attach"
+	elog "You need to attach to a project to do anything useful with boinc."
+	elog "You can do this by running /etc/init.d/boinc attach"
 	elog "The howto for configuration is located at:"
 	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
 	elog
 	# Add warning about the new password for the client, bug 121896.
 	if use X; then
 		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/${PN}/gui_rpc_auth.cfg"
+		elog "/var/lib/boinc/gui_rpc_auth.cfg"
 		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/${PN}"
+		elog "/etc/conf.d/boinc"
 		elog "You should change this password to something more memorable (can be even blank)."
 		elog "Remember to launch init script before using manager. Or changing the password."
 		elog
diff --git a/sci-misc/boinc/files/boinc-7.2-fix_subdirs.patch b/sci-misc/boinc/files/boinc-7.2-fix_subdirs.patch
deleted file mode 100644
index 1e6a854..0000000
--- a/sci-misc/boinc/files/boinc-7.2-fix_subdirs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- Makefile.am  | 14 +++++++-------
- configure.ac |  5 -----
- 2 files changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 6322db1..45d8b67 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,13 +10,13 @@ ACLOCAL_AMFLAGS = -I m4
- 
- if ENABLE_LIBRARIES
-     API_SUBDIRS = api lib
--if ENABLE_SERVER
--    API_SUBDIRS += zip
--endif
-+#if ENABLE_SERVER
-+#    API_SUBDIRS += zip
-+#endif
- endif
- 
- if ENABLE_SERVER
--   SERVER_SUBDIRS = db test py sched apps tools vda html
-+   SERVER_SUBDIRS = db test py sched apps tools vda
- ## once contained samples/example_app which breaks out-of-source-tree builds
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index 2bef437..5a9e104 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -964,7 +963,6 @@ AC_CONFIG_FILES([
-                  db/Makefile
-                  doc/Makefile
-                  doc/manpages/Makefile
--                 html/Makefile
-                  lib/Makefile
-                  locale/Makefile
-                  Makefile
-@@ -994,9 +992,6 @@ AC_CONFIG_FILES([
-                  tools/boinc_path_config.py:py/boinc_path_config.py.in
-                  tools/Makefile
-                  vda/Makefile
--                 zip/Makefile
--                 zip/zip/Makefile
--                 zip/unzip/Makefile
-                  m4/Makefile
- 		])
- 
diff --git a/sci-misc/boinc/files/boinc-7.2-remove_boincscr.patch b/sci-misc/boinc/files/boinc-7.2-remove_boincscr.patch
deleted file mode 100644
index 2abc00f..0000000
--- a/sci-misc/boinc/files/boinc-7.2-remove_boincscr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am	2014-11-05 13:23:17.000000000 +0100
-+++ b/Makefile.am	2014-11-05 13:25:43.558205864 +0100
-@@ -26,9 +26,9 @@
- 
- if ENABLE_MANAGER
-    CLIENTGUI_SUBDIRS = clientgui locale
--if BUILD_X11_SCREENSAVER
--   CLIENTGUI_SUBDIRS += clientscr
--endif
-+#if BUILD_X11_SCREENSAVER
-+#   CLIENTGUI_SUBDIRS += clientscr
-+#endif
- endif
- 
- # ORDER MATTERS below.  One must build dependencies FIRST, then things
diff --git a/sci-misc/boinc/files/boincscr.desktop b/sci-misc/boinc/files/boincscr.desktop
deleted file mode 100644
index b527729..0000000
--- a/sci-misc/boinc/files/boincscr.desktop
+++ /dev/null
@@ -1,33 +0,0 @@
-[Desktop Entry]
-Exec=boincscr
-Icon=preferences-desktop-screensaver
-Type=Service
-X-KDE-ServiceTypes=ScreenSaver
-TryExec=xscreensaver
-Actions=InWindow;Root;Setup;
-Name=BOINC ScreenSaver
-Name[de]=BOINC Bildschirmschoner
-Name[en_GB]=BOINC ScreenSaver
-X-KDE-Category=OpenGL Screen Savers
-X-KDE-Type=OpenGL
-
-[Desktop Action Setup]
-Exec=kxsconfig boincscr
-Name=Setup...
-Name[de]=Einrichtung ...
-Name[en_GB]=Setup...
-
-[Desktop Action InWindow]
-Exec=kxsrun boincscr -- -window -window-id %w
-Name=Display in Specified Window
-Name[de]=In bestimmten Fenster anzeigen
-Name[en_GB]=Display in Specified Window
-NoDisplay=true
-
-[Desktop Action Root]
-Exec=kxsrun boincscr -- -root -boinc_dir /var/lib/boinc
-Name=Display in Root Window
-Name[de]=In Hintergrundfenster anzeigen
-Name[en_GB]=Display in Root Window
-NoDisplay=true
-
diff --git a/sci-misc/boinc/files/boincscr.xml b/sci-misc/boinc/files/boincscr.xml
deleted file mode 100644
index c596c04..0000000
--- a/sci-misc/boinc/files/boincscr.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<screensaver name="boincscr" _label="Boinc">
-
-  <command arg="-root -boinc_dir /var/lib/boinc"/>
-
-  <xscreensaver-updater />
-
-  <_description>
-This is a XScreenSaver compatible BOINC screensaver for Unix/X11.
-
-This screensaver is part of BOINC.
-http://boinc.berkeley.edu
-Copyright (C) 2010 University of California
-  </_description>
-</screensaver>