public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Christoph Junghans" <kleiner_otti@gmx.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/vmd/
Date: Sun, 23 Dec 2012 03:35:21 +0000 (UTC)	[thread overview]
Message-ID: <1356233683.985c06cbeaeba817c34489a9c5af56de0c02740e.kleiner_otti@gentoo> (raw)

commit:     985c06cbeaeba817c34489a9c5af56de0c02740e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 03:34:43 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Dec 23 03:34:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=985c06cb

fix build with !cuda and python=3 + qa

Package-Manager: portage-2.2.0_alpha149

---
 sci-chemistry/vmd/ChangeLog           |    3 +++
 sci-chemistry/vmd/vmd-1.9.1-r1.ebuild |    8 +++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 32fdd60..296c399 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.50 2012/11/14 15:18:58 jlec Exp $
 
+  23 Dec 2012; Christoph Junghans <ottxor@gentoo.org> vmd-1.9.1-r1.ebuild:
+  fix build with !cuda and python=3 + qa
+
   29 Nov 2012; Justin Lecher <jlec@gentoo.org> vmd-1.9.1-r1.ebuild:
   Drop dep on old tk
 

diff --git a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild
index b361abd..259c60c 100644
--- a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild
@@ -63,8 +63,13 @@ pkg_nofetch() {
 	elog "Place both in ${DISTDIR}"
 }
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
-	cuda_sanitize
+	use cuda && cuda_sanitize
 
 	cd "${WORKDIR}"/plugins
 
@@ -216,5 +221,6 @@ src_install() {
 	insinto /usr/share/pixmaps
 	doins "${WORKDIR}"/vmd.png
 	eprefixify "${WORKDIR}"/vmd.desktop
+	sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
 	domenu "${WORKDIR}"/vmd.desktop
 }


             reply	other threads:[~2012-12-23  3:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-23  3:35 Christoph Junghans [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-01-14  7:11 [gentoo-commits] proj/sci:master commit in: sci-chemistry/vmd/ Justin Lecher
2012-11-29 21:05 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-14 15:20 Justin Lecher
2012-10-22  9:11 Reinis Danne

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1356233683.985c06cbeaeba817c34489a9c5af56de0c02740e.kleiner_otti@gentoo \
    --to=kleiner_otti@gmx.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox