From d1e4d2031215baf7626561de59b4ab31535cf155 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 9 Jul 2010 16:49:01 +0000 Subject: Version bump. Drop older. Fix bugs #323635 #309439 #314155. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-misc/boinc/ChangeLog | 9 ++- sci-misc/boinc/Manifest | 18 ++--- sci-misc/boinc/boinc-6.10.18.ebuild | 142 ------------------------------------ sci-misc/boinc/boinc-6.10.36.ebuild | 142 ------------------------------------ sci-misc/boinc/boinc-6.10.58.ebuild | 142 ++++++++++++++++++++++++++++++++++++ sci-misc/boinc/files/boinc.init | 23 +++--- 6 files changed, 172 insertions(+), 304 deletions(-) delete mode 100644 sci-misc/boinc/boinc-6.10.18.ebuild delete mode 100644 sci-misc/boinc/boinc-6.10.36.ebuild create mode 100644 sci-misc/boinc/boinc-6.10.58.ebuild (limited to 'sci-misc') diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog index 9bc3203dfe2b..11cc4edb1c57 100644 --- a/sci-misc/boinc/ChangeLog +++ b/sci-misc/boinc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-misc/boinc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.88 2010/04/02 09:48:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.89 2010/07/09 16:49:01 scarabeus Exp $ + +*boinc-6.10.58 (09 Jul 2010) + + 09 Jul 2010; Tomáš Chvátal + -boinc-6.10.18.ebuild, -boinc-6.10.36.ebuild, +boinc-6.10.58.ebuild, + files/boinc.init: + Version bump. Drop older. Fix bugs #323635 #309439 #314155. 02 Apr 2010; Tomáš Chvátal +files/generate_tarball.sh: diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest index fa69a5f159a3..2918e14069a9 100644 --- a/sci-misc/boinc/Manifest +++ b/sci-misc/boinc/Manifest @@ -3,18 +3,16 @@ Hash: SHA1 AUX 6.4.5-glibc210.patch 300 RMD160 0ca2f52c4265cf5a5763a7c1e2ce27bdc929bde8 SHA1 5a5a51b299e52d8a9ceba8c454b35488260721ea SHA256 b39db0c5208fc3c0a89ae0b0d809e5f8f72e7494c98e1b0b23eadcc5c8243377 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e -AUX boinc.init 3225 RMD160 fbb2ffc29f38ce26a422bff0791bfb74b3a257df SHA1 c97b93ac32a212a5c2c1951e06237efc08540930 SHA256 726d6d96e0c81b235f3a8a4c6f27bbe115bedd9df5eb36c89c2d8169c9173296 +AUX boinc.init 3384 RMD160 3726f844eb570c14707d241efe92fd7d06b189d4 SHA1 91ad4494ced89635fdfd6c731667d2b072d4e457 SHA256 71e5b38ab8ce39e914aff8839c67526cfed4ac6d8994525c88bb44eb5537144b AUX generate_tarball.sh 3416 RMD160 dbf729a669586beab2d79e6f4fb1c246ad778808 SHA1 b7c8aa1f08971d8e5cfa8e2543f4d8ffc83c69ba SHA256 e5ee6e3801bd5d699da6d8acb297b076d11dab61fb6e42263720bf1393bfcafc -DIST boinc-6.10.18.tar.bz2 11392526 RMD160 5fe8fac83181833f8085bac455c6252adb7b4d62 SHA1 07d695ba80faa7761d74a0b6d5cfabd5bb045a00 SHA256 a2d02b9a996ce398d1f32dbc40f8dcb5a7866a54c4936f64350391f624e31ea3 -DIST boinc-6.10.36.tar.bz2 11540181 RMD160 9679724c87fa0f6f6674f791b2f09173aebd6458 SHA1 260e9bfc83a0e1982efddd3760eb81973b26bbd7 SHA256 9772b5c43bf73fbd227687b6be1df32123b79a9276ac7704e755f2efa415d966 -EBUILD boinc-6.10.18.ebuild 3587 RMD160 e7d2d58f8762847b9e364b371403bd97f6df0917 SHA1 ab0403e3bd0506930611a0294bebbc0bf5e96f26 SHA256 32a6a5011b392b6d54174f9f505dbc38dff51ffc291b4b594ba6a984381a8b81 -EBUILD boinc-6.10.36.ebuild 3587 RMD160 90ebab4120a896fb9a118734bc8afeeaa2138b6f SHA1 a157eb2ad53a176aabfa1885213732164e053081 SHA256 30422d7df5dd65e18c3ebb8f3275631f7c1d45cdd84e289fcc9e9794c1cca2e5 -MISC ChangeLog 16352 RMD160 7942924780617768fe6c0a57caafa40505e42060 SHA1 968ea42410cba44833afce62ad9a4ba82b310936 SHA256 b85c98332ba01af008dbd5228c86fe80432496027f8fe12ecdd17b022c017422 +DIST boinc-6.10.58.tar.bz2 11599121 RMD160 f38eeaead419fdc56d406a2293d1d2c66deed61d SHA1 cba4cefffa1aaf562ef85d1b2555de4ba28255d1 SHA256 70199b0c820bf0a40d9ec54c1be2115a5cf447f4baacc7c3b67175bca7240f42 +EBUILD boinc-6.10.58.ebuild 3603 RMD160 1dafcc00888a6137af5c14669c6ef844827c7d56 SHA1 6eb99767a348c232cd82f04879a73a11ff7ce737 SHA256 1aab714232540c0da52f0fd772058fbb16734d15bdf3737a58ffd88d3c70c66b +MISC ChangeLog 16591 RMD160 4b54d51e6e4420aa8c00daf2835d53f49a8f38a1 SHA1 8c9c91d6f0a77053d0152531566557e127f4b75b SHA256 827706b0ebf40dfa9b929fe947ca181ef11652fc98ab8e6aca26a76193a11620 MISC metadata.xml 774 RMD160 a5a2ec0c50667b20da393a2a18e63fcdc94e2eb0 SHA1 16e144f257f88c1cb7ce996aec900709096ce048 SHA256 c9024478fda0e26c17e3f324090e33dd0954cc0397802dd9872a9bdf1f733e6b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAku1vW8ACgkQHB6c3gNBRYdTegCfRTSptUEWFeagvLvXI1L6QpNm -qygAoJ9NJnEMi4a5l3psSobzVH04tdBU -=M3EU +iEYEARECAAYFAkw3UsIACgkQHB6c3gNBRYdi4QCgj617V7er9PxKlW00eOaK2jof +3CkAmgOM/zmHg9wCKpB6YEXYklAN+DXJ +=1AIS -----END PGP SIGNATURE----- diff --git a/sci-misc/boinc/boinc-6.10.18.ebuild b/sci-misc/boinc/boinc-6.10.18.ebuild deleted file mode 100644 index 2c609d2f98d9..000000000000 --- a/sci-misc/boinc/boinc-6.10.18.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.18.ebuild,v 1.5 2010/03/23 03:41:05 vapier Exp $ - -EAPI="2" - -inherit flag-o-matic depend.apache eutils wxwidgets autotools base - -DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" -HOMEPAGE="http://boinc.ssl.berkeley.edu/" -SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="X +client cuda" - -RDEPEND=" - !sci-misc/boinc-bin - !app-admin/quickswitch - >=app-misc/ca-certificates-20080809 - dev-libs/openssl - net-misc/curl - 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 - media-libs/jpeg - x11-libs/wxGTK:2.8[X,opengl] - ) -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/6.4.5-glibc210.patch -) - -src_prepare() { - # use system ssl certificates - mkdir "${S}"/curl - cp /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" - - base_src_prepare - - eautoreconf -} - -src_configure() { - local wxconf="" - local conf="" - - # define preferable CFLAGS (recommended by upstream) - append-flags -O3 -funroll-loops -fforce-addr -ffast-math - - # 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 - - conf+=" --disable-server" - use X || conf+=" --disable-manager" - use client || conf+=" --disable-client" - - # configure - econf \ - --disable-dependency-tracking \ - --enable-unicode \ - --with-ssl \ - $(use_with X x) \ - ${wxconf} \ - ${conf} -} - -src_install() { - base_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 "${D}"/etc/ - - newinitd "${FILESDIR}"/${PN}.init ${PN} - newconfd "${FILESDIR}"/${PN}.conf ${PN} -} - -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() { - 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 "To do so run as root:" - elog "gpasswd -a boinc video" - fi -} diff --git a/sci-misc/boinc/boinc-6.10.36.ebuild b/sci-misc/boinc/boinc-6.10.36.ebuild deleted file mode 100644 index a08ecfbce920..000000000000 --- a/sci-misc/boinc/boinc-6.10.36.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.36.ebuild,v 1.2 2010/03/23 03:41:05 vapier Exp $ - -EAPI="2" - -inherit flag-o-matic depend.apache eutils wxwidgets autotools base - -DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" -HOMEPAGE="http://boinc.ssl.berkeley.edu/" -SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="X +client cuda" - -RDEPEND=" - !sci-misc/boinc-bin - !app-admin/quickswitch - >=app-misc/ca-certificates-20080809 - dev-libs/openssl - net-misc/curl - 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 - media-libs/jpeg - x11-libs/wxGTK:2.8[X,opengl] - ) -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/6.4.5-glibc210.patch -) - -src_prepare() { - # use system ssl certificates - mkdir "${S}"/curl - cp /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" - - base_src_prepare - - eautoreconf -} - -src_configure() { - local wxconf="" - local conf="" - - # define preferable CFLAGS (recommended by upstream) - append-flags -O3 -funroll-loops -fforce-addr -ffast-math - - # 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 - - conf+=" --disable-server" - use X || conf+=" --disable-manager" - use client || conf+=" --disable-client" - - # configure - econf \ - --disable-dependency-tracking \ - --enable-unicode \ - --with-ssl \ - $(use_with X x) \ - ${wxconf} \ - ${conf} -} - -src_install() { - base_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 "${D}"/etc/ - - newinitd "${FILESDIR}"/${PN}.init ${PN} - newconfd "${FILESDIR}"/${PN}.conf ${PN} -} - -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() { - 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 "To do so run as root:" - elog "gpasswd -a boinc video" - fi -} diff --git a/sci-misc/boinc/boinc-6.10.58.ebuild b/sci-misc/boinc/boinc-6.10.58.ebuild new file mode 100644 index 000000000000..5faf7451aaca --- /dev/null +++ b/sci-misc/boinc/boinc-6.10.58.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2010 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.ebuild,v 1.1 2010/07/09 16:49:01 scarabeus Exp $ + +EAPI="2" + +inherit flag-o-matic depend.apache eutils wxwidgets autotools base + +DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" +HOMEPAGE="http://boinc.ssl.berkeley.edu/" +SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="X +client cuda" + +RDEPEND=" + !sci-misc/boinc-bin + !app-admin/quickswitch + >=app-misc/ca-certificates-20080809 + dev-libs/openssl + net-misc/curl[ssl,-gnutls] + 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 + media-libs/jpeg + x11-libs/wxGTK:2.8[X,opengl] + ) +" +DEPEND="${RDEPEND} + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/6.4.5-glibc210.patch +) + +src_prepare() { + # use system ssl certificates + mkdir "${S}"/curl + cp /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" + + base_src_prepare + + eautoreconf +} + +src_configure() { + local wxconf="" + local conf="" + + # define preferable CFLAGS (recommended by upstream) + append-flags -O3 -funroll-loops -fforce-addr -ffast-math + + # 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 + + conf+=" --disable-server" + use X || conf+=" --disable-manager" + use client || conf+=" --disable-client" + + # configure + econf \ + --disable-dependency-tracking \ + --enable-unicode \ + --with-ssl \ + $(use_with X x) \ + ${wxconf} \ + ${conf} +} + +src_install() { + base_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 "${D}"/etc/ + + newinitd "${FILESDIR}"/${PN}.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} +} + +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() { + 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 "To do so run as root:" + elog "gpasswd -a boinc video" + fi +} diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init index b8a920b5018c..1dc028eadd1a 100644 --- a/sci-misc/boinc/files/boinc.init +++ b/sci-misc/boinc/files/boinc.init @@ -57,27 +57,32 @@ start() { fi if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then - ARGS="${ARGS} -allow_remote_gui_rpc" + ARGS="${ARGS} --allow_remote_gui_rpc" fi if [ -n "${RC_UNAME}" ]; then - PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}" + PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' ${ARGS}" else - PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &" + PARAMS="${ARGS} >> '${LOGFILE}' 2>&1" fi generate_logs - # sys-apps/util-linux - CHRT="/usr/bin/chrt ${SCHED_PARAM}" + # sys-apps/util-linux (setup scheduling policy if specified, otherwise blank out + if [ "${SCHED_PARAM}" = "" ]; then + CHRT="" + else + CHRT="/usr/bin/chrt ${SCHED_PARAM}" + fi eval ${CHRT} start-stop-daemon \ - --quiet --start --chdir "${RUNTIMEDIR}" \ - --pidfile "${PIDFILE}" \ + --start --quiet --chdir "${RUNTIMEDIR}" \ + --background \ --make-pidfile \ - --exec "${BOINCBIN}" --chuid "${USER}:${GROUP}" \ + --pidfile "${PIDFILE}" \ + --chuid "${USER}:${GROUP}" \ --nicelevel "${NICELEVEL}" \ - ${PARAMS} + --exec "${BOINCBIN}" -- ${PARAMS} RESULT=$? -- cgit v1.2.3-65-gdbad