Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/viewmol/files/
Date: Tue, 31 Jan 2017 08:42:30
Message-Id: 1485852106.2c46583b34dfe86c828562fb17a00d9fa7e5ffc0.soap@gentoo
1 commit: 2c46583b34dfe86c828562fb17a00d9fa7e5ffc0
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 17:57:27 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:41:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c46583b
7
8 sci-chemistry/viewmol: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 .../files/2.4.1-change-default-path-to-usr.patch | 11 -----------
13 .../files/2.4.1-look-for-python-in-right-place.patch | 20 --------------------
14 .../files/2.4.1-use-root-for-app-defaults.patch | 20 --------------------
15 3 files changed, 51 deletions(-)
16
17 diff --git a/sci-chemistry/viewmol/files/2.4.1-change-default-path-to-usr.patch b/sci-chemistry/viewmol/files/2.4.1-change-default-path-to-usr.patch
18 deleted file mode 100644
19 index e5e22ff..00000000
20 --- a/sci-chemistry/viewmol/files/2.4.1-change-default-path-to-usr.patch
21 +++ /dev/null
22 @@ -1,11 +0,0 @@
23 ---- viewmol-2.4.1.orig/source/getrc.c 2004-10-20 05:54:35.000000000 -0700
24 -+++ viewmol-2.4.1/source/getrc.c 2005-12-02 11:38:32.000000000 -0800
25 -@@ -87,7 +87,7 @@
26 -
27 - static char viewmolpath[MAXLENLINE];
28 -
29 --#define DEFAULTPATH "/usr/local/lib/viewmol"
30 -+#define DEFAULTPATH "/usr/lib/viewmol"
31 -
32 - int getrc(void)
33 - {
34
35 diff --git a/sci-chemistry/viewmol/files/2.4.1-look-for-python-in-right-place.patch b/sci-chemistry/viewmol/files/2.4.1-look-for-python-in-right-place.patch
36 deleted file mode 100644
37 index 4f981a0..00000000
38 --- a/sci-chemistry/viewmol/files/2.4.1-look-for-python-in-right-place.patch
39 +++ /dev/null
40 @@ -1,20 +0,0 @@
41 ---- viewmol-2.4.1.orig/source/getmachine 2004-08-29 08:04:09.000000000 -0700
42 -+++ viewmol-2.4.1/source/getmachine 2005-12-02 11:19:36.000000000 -0800
43 -@@ -156,7 +158,7 @@
44 - echo "PNGINCLUDE = $pnginclude" >> .config.$os
45 -
46 - # Python
47 -- list=`find /usr -name Python.h -print 2> /dev/null`
48 -+ list=`find /usr/include -name Python.h -print 2> /dev/null`
49 - version=`(for i in $list
50 - do
51 - dir=\`dirname $i\`
52 -@@ -179,7 +181,7 @@
53 - echo "PYTHONINCLUDE = $pythoninclude" >> .config.$os
54 - if [ "$version" != "" ]
55 - then
56 -- pythonlib=`dirname \`find /usr -name "lib${version}*.a" -print 2> /dev/null | grep "$version/"\``
57 -+ pythonlib=`dirname \`find /usr/lib -name "lib${version}*.a" -print 2> /dev/null | grep "$version/"\``
58 - else
59 - givehint
60 - echo -n "Please enter the name of the directory where the Python library can be found: "
61
62 diff --git a/sci-chemistry/viewmol/files/2.4.1-use-root-for-app-defaults.patch b/sci-chemistry/viewmol/files/2.4.1-use-root-for-app-defaults.patch
63 deleted file mode 100644
64 index c04da30..00000000
65 --- a/sci-chemistry/viewmol/files/2.4.1-use-root-for-app-defaults.patch
66 +++ /dev/null
67 @@ -1,20 +0,0 @@
68 ---- viewmol-2.4.1.orig/source/install 2004-10-09 08:38:31.000000000 -0700
69 -+++ viewmol-2.4.1/source/install 2005-12-02 11:34:35.000000000 -0800
70 -@@ -71,7 +71,7 @@
71 - find $ROOT/lib/viewmol -type d -exec chmod a+rx {} \;
72 - sed 's/\/source//g' viewmolrc > $ROOT/lib/viewmol/viewmolrc
73 - chmod -R 644 $ROOT/lib/viewmol/viewmolrc
74 --if [ -d /usr/X11R6/lib/X11/app-defaults ]
75 -+if [ -d $ROOT/X11R6/lib/X11/app-defaults ]
76 - then
77 - locale=`echo $LANG | cut -c1-2`
78 - if [ "$locale" = "en" ]
79 -@@ -82,6 +82,6 @@
80 - # The C locale is defined by default for rpm builds, overwrite it
81 - locale="en_US"
82 - fi
83 -- cp locale/${locale}/Viewmol /usr/X11R6/lib/X11/app-defaults
84 -- chmod a+r /usr/X11R6/lib/X11/app-defaults/Viewmol
85 -+ cp locale/${locale}/Viewmol $ROOT/X11R6/lib/X11/app-defaults
86 -+ chmod a+r $ROOT/X11R6/lib/X11/app-defaults/Viewmol
87 - fi