public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: vmd-1.8.7.ebuild ChangeLog
@ 2009-08-07 13:29 Markus Dittrich (markusle)
  0 siblings, 0 replies; 3+ messages in thread
From: Markus Dittrich (markusle) @ 2009-08-07 13:29 UTC (permalink / raw
  To: gentoo-commits

markusle    09/08/07 13:29:11

  Modified:             vmd-1.8.7.ebuild ChangeLog
  Log:
  Removed the EAPI2 check for -truetype and added explicit error logic.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sci-chemistry/vmd/vmd-1.8.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?r1=1.2&r2=1.3

Index: vmd-1.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vmd-1.8.7.ebuild	6 Aug 2009 15:18:08 -0000	1.2
+++ vmd-1.8.7.ebuild	7 Aug 2009 13:29:11 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.2 2009/08/06 15:18:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.3 2009/08/07 13:29:11 markusle Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@
 	virtual/opengl
 	x11-libs/fltk:1.1
 	>=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4[-truetype]
+	>=dev-lang/tk-8.4
 	=dev-lang/python-2*
 	dev-lang/perl
 	dev-python/numpy
@@ -43,6 +43,16 @@
 }
 
 src_prepare() {
+	# currently, tk-8.5* with USE=truetype breaks some
+	# tk apps such as Sequence Viewer or Timeline.
+	if has_version =dev-lang/tcl-8.5* && built_with_use dev-lang/tk truetype; then
+		echo
+		eerror "Error: Your tk was build with USE=\"truetype\" which"
+		eerror "will cause some of VMD's tk apps to not work properly"
+		eerror "(Sequence Viewer, Timeline, ..)."
+		die "Please emerge tk with USE=\"-truetype\"".
+	fi
+
 	# apply LINUX-arch patches to vmd configure
 	epatch "${FILESDIR}/${P}-config.patch"
 	epatch "${FILESDIR}/${P}-use-bash-startup.patch"



1.24                 sci-chemistry/vmd/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	6 Aug 2009 14:19:15 -0000	1.23
+++ ChangeLog	7 Aug 2009 13:29:11 -0000	1.24
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.23 2009/08/06 14:19:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.24 2009/08/07 13:29:11 markusle Exp $
+
+  07 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
+  files/vmd-1.8.7-config.patch:
+  Remove the EAPI2 check for -truetype and add explicit error logic
+  so tk-8.4 users can emerge vmd as well. Also updated the config
+  patch to handle tk8.4 better.
 
 *vmd-1.8.7 (05 Aug 2009)
 






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: vmd-1.8.7.ebuild ChangeLog
@ 2009-08-11 13:59 Markus Dittrich (markusle)
  0 siblings, 0 replies; 3+ messages in thread
From: Markus Dittrich (markusle) @ 2009-08-11 13:59 UTC (permalink / raw
  To: gentoo-commits

markusle    09/08/11 13:59:47

  Modified:             vmd-1.8.7.ebuild ChangeLog
  Log:
  Added desktop entry and vmd icon (#262275).
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sci-chemistry/vmd/vmd-1.8.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?r1=1.3&r2=1.4

Index: vmd-1.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vmd-1.8.7.ebuild	7 Aug 2009 13:29:11 -0000	1.3
+++ vmd-1.8.7.ebuild	11 Aug 2009 13:59:47 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.3 2009/08/07 13:29:11 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.4 2009/08/11 13:59:47 markusle Exp $
 
 EAPI="2"
 
@@ -162,4 +162,10 @@
 	# adjust path in vmd wrapper
 	sed -e "s:${D}::" -i "${D}"/usr/bin/${PN} \
 		|| die "failed to set up vmd wrapper script"
+
+	# install icon and generate desktop entry
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/vmd.png || die "Failed to install vmd icon"
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/vmd.desktop || die "Failed to install desktop entry"
 }



1.25                 sci-chemistry/vmd/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	7 Aug 2009 13:29:11 -0000	1.24
+++ ChangeLog	11 Aug 2009 13:59:47 -0000	1.25
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.24 2009/08/07 13:29:11 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.25 2009/08/11 13:59:47 markusle Exp $
+
+  11 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
+  +files/vmd.desktop, +files/vmd.png:
+  Added desktop entry and vmd icon (#262275).
+  Thanks much to Bjoern Olausson for creating them.
 
   07 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
   files/vmd-1.8.7-config.patch:






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: vmd-1.8.7.ebuild ChangeLog
@ 2009-09-18 14:32 Petteri Raty (betelgeuse)
  0 siblings, 0 replies; 3+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-09-18 14:32 UTC (permalink / raw
  To: gentoo-commits

betelgeuse    09/09/18 14:32:59

  Modified:             vmd-1.8.7.ebuild ChangeLog
  Log:
  Remove built_with_use and use proper DEPEND atoms that work properly for both tk 8.4 and 8.5 users.
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.5                  sci-chemistry/vmd/vmd-1.8.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild?r1=1.4&r2=1.5

Index: vmd-1.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vmd-1.8.7.ebuild	11 Aug 2009 13:59:47 -0000	1.4
+++ vmd-1.8.7.ebuild	18 Sep 2009 14:32:58 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.4 2009/08/11 13:59:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.5 2009/09/18 14:32:58 betelgeuse Exp $
 
 EAPI="2"
 
@@ -17,11 +17,16 @@
 
 RESTRICT="fetch"
 
+# currently, tk-8.5* with USE=truetype breaks some
+# tk apps such as Sequence Viewer or Timeline.
 DEPEND="x11-libs/libXft
 	virtual/opengl
 	x11-libs/fltk:1.1
 	>=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4
+	|| (
+		>=dev-lang/tk-8.5[-truetype]
+		=dev-lang/tk-8.4*
+	)
 	=dev-lang/python-2*
 	dev-lang/perl
 	dev-python/numpy
@@ -43,16 +48,6 @@
 }
 
 src_prepare() {
-	# currently, tk-8.5* with USE=truetype breaks some
-	# tk apps such as Sequence Viewer or Timeline.
-	if has_version =dev-lang/tcl-8.5* && built_with_use dev-lang/tk truetype; then
-		echo
-		eerror "Error: Your tk was build with USE=\"truetype\" which"
-		eerror "will cause some of VMD's tk apps to not work properly"
-		eerror "(Sequence Viewer, Timeline, ..)."
-		die "Please emerge tk with USE=\"-truetype\"".
-	fi
-
 	# apply LINUX-arch patches to vmd configure
 	epatch "${FILESDIR}/${P}-config.patch"
 	epatch "${FILESDIR}/${P}-use-bash-startup.patch"



1.26                 sci-chemistry/vmd/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/vmd/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	11 Aug 2009 13:59:47 -0000	1.25
+++ ChangeLog	18 Sep 2009 14:32:58 -0000	1.26
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.25 2009/08/11 13:59:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.26 2009/09/18 14:32:58 betelgeuse Exp $
+
+  18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> vmd-1.8.7.ebuild:
+  Remove built_with_use and use proper DEPEND atoms that work properly for
+  both tk 8.4 and 8.5 users.
 
   11 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
   +files/vmd.desktop, +files/vmd.png:






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-09-18 14:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-18 14:32 [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: vmd-1.8.7.ebuild ChangeLog Petteri Raty (betelgeuse)
  -- strict thread matches above, loose matches on Subject: below --
2009-08-11 13:59 Markus Dittrich (markusle)
2009-08-07 13:29 Markus Dittrich (markusle)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox