Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-biology/embassy-meme/, sci-biology/embassy-meme/files/
Date: Fri, 09 Oct 2020 07:35:35
Message-Id: 1602228900.96c3a9acc9ec867d071248428194fb3214fd4107.mgorny@gentoo
1 commit: 96c3a9acc9ec867d071248428194fb3214fd4107
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 07:33:56 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 07:35:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c3a9ac
7
8 sci-biology/embassy-meme: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735446
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sci-biology/embassy-meme/Manifest | 1 -
15 .../embassy-meme/embassy-meme-4.7.660.ebuild | 17 ----
16 .../embassy-meme-4.7.650_fix-build-system.patch | 100 ---------------------
17 sci-biology/embassy-meme/metadata.xml | 11 ---
18 5 files changed, 130 deletions(-)
19
20 diff --git a/profiles/package.mask b/profiles/package.mask
21 index 0ba68128733..f8f963cefb2 100644
22 --- a/profiles/package.mask
23 +++ b/profiles/package.mask
24 @@ -515,7 +515,6 @@ net-misc/ris-linux
25 net-wireless/mousejack
26 net-wireless/python-wifi
27 sci-biology/amos
28 -sci-biology/embassy-meme
29
30 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-09-01)
31 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
32
33 diff --git a/sci-biology/embassy-meme/Manifest b/sci-biology/embassy-meme/Manifest
34 deleted file mode 100644
35 index 551af7aef93..00000000000
36 --- a/sci-biology/embassy-meme/Manifest
37 +++ /dev/null
38 @@ -1 +0,0 @@
39 -DIST embassy-meme-4.7.660.tar.gz 622448 BLAKE2B 93bbbe3de085aa2cd843349f8397b2d1f547be62afdb7deb30eec90a891f7825c847b92754bd956388b1bfe0250cabcbc7ad68f7d0378748a7949001016d344c SHA512 0536531b198aac09a9fe6c17cf1c60c766789c94a7f83f743a90aaa65061c95534bf398c53611a34549b7ec1a4928fdc45fe0d2553f25f85eeda41f90c2e8c6f
40
41 diff --git a/sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild b/sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild
42 deleted file mode 100644
43 index 8752e78d8fc..00000000000
44 --- a/sci-biology/embassy-meme/embassy-meme-4.7.660.ebuild
45 +++ /dev/null
46 @@ -1,17 +0,0 @@
47 -# Copyright 1999-2017 Gentoo Foundation
48 -# Distributed under the terms of the GNU General Public License v2
49 -
50 -EAPI=6
51 -
52 -EBO_DESCRIPTION="MEME - Multiple Em for Motif Elicitation"
53 -
54 -EBO_EAUTORECONF=1
55 -
56 -inherit emboss-r2
57 -
58 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
59 -
60 -RDEPEND="sci-biology/meme"
61 -
62 -S="${WORKDIR}/MEME-4.7.650"
63 -PATCHES=( "${FILESDIR}"/${PN}-4.7.650_fix-build-system.patch )
64
65 diff --git a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch b/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
66 deleted file mode 100644
67 index 56f5814e1ef..00000000000
68 --- a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch
69 +++ /dev/null
70 @@ -1,100 +0,0 @@
71 - configure.ac | 49 +++++++------------------------------------------
72 - src/Makefile.am | 6 ++----
73 - 2 files changed, 9 insertions(+), 46 deletions(-)
74 -
75 -diff --git a/configure.ac b/configure.ac
76 -index 391989f..d921f25 100644
77 ---- a/configure.ac
78 -+++ b/configure.ac
79 -@@ -635,33 +635,6 @@ AS_CASE([${host_os}],
80 -
81 -
82 -
83 --dnl PCRE library definitions - see the MAJOR and MINOR values
84 --dnl to see which version's configure.in these lines come from
85 --
86 --dnl Provide the current PCRE version information. Do not use numbers
87 --dnl with leading zeros for the minor version, as they end up in a C
88 --dnl macro, and may be treated as octal constants. Stick to single
89 --dnl digits for minor numbers less than 10. There are unlikely to be
90 --dnl that many releases anyway.
91 --
92 --PCRE_MAJOR="7"
93 --PCRE_MINOR="9"
94 --PCRE_DATE="11-Apr-2009"
95 --PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
96 --
97 --dnl Default values for miscellaneous macros
98 --
99 --POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
100 --
101 --dnl Provide versioning information for libtool shared libraries that
102 --dnl are built by default on Unix systems.
103 --
104 --PCRE_LIB_VERSION="0:1:0"
105 --PCRE_POSIXLIB_VERSION="0:0:0"
106 --
107 --
108 --
109 --
110 - dnl FIXME: This does no longer seem required with Autoconf 2.67?
111 - dnl Intel MacOSX 10.6 puts X11 in a non-standard place
112 - dnl AS_IF([test "x${with_x}" != "xno"],
113 -@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL
114 -
115 -
116 -
117 --dnl "Export" these variables for PCRE
118 --
119 --AC_SUBST([HAVE_MEMMOVE])
120 --AC_SUBST([HAVE_STRERROR])
121 --AC_SUBST([PCRE_MAJOR])
122 --AC_SUBST([PCRE_MINOR])
123 --AC_SUBST([PCRE_DATE])
124 --AC_SUBST([PCRE_VERSION])
125 --AC_SUBST([PCRE_LIB_VERSION])
126 --AC_SUBST([PCRE_POSIXLIB_VERSION])
127 --AC_SUBST([POSIX_MALLOC_THRESHOLD])
128 --
129 --
130 --
131 --
132 - dnl Test if --enable-localforce given
133 - locallink="no"
134 - embprefix="/usr/local"
135 -@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs],
136 - AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
137 -
138 -
139 -+AS_IF([test "x${enable_systemlibs}" = "xyes"],
140 -+[
141 -+dnl using system libraries
142 -+ PKG_CHECK_MODULES([PLPLOT], [plplotd],
143 -+ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
144 -+ )
145 -+])
146 -
147 -
148 - # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
149 -diff --git a/src/Makefile.am b/src/Makefile.am
150 -index 1600399..9f28162 100644
151 ---- a/src/Makefile.am
152 -+++ b/src/Makefile.am
153 -@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \
154 - -I../../../ajax/ensembl -I../../../ajax/ajaxdb \
155 - -I../../../ajax/acd -I../../../plplot
156 - else
157 --AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \
158 -- $(NLINCLUDES) \
159 -- -I${embprefix}/include/epcre
160 -+AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS)
161 - endif
162 -
163 - if ISSHARED
164 -@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
165 - $(XLIB)
166 - else
167 - LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
168 -- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
169 -+ -lajax $(NLADD) $(XLIB)
170 - endif
171
172 diff --git a/sci-biology/embassy-meme/metadata.xml b/sci-biology/embassy-meme/metadata.xml
173 deleted file mode 100644
174 index d1b9a7602ec..00000000000
175 --- a/sci-biology/embassy-meme/metadata.xml
176 +++ /dev/null
177 @@ -1,11 +0,0 @@
178 -<?xml version="1.0" encoding="UTF-8"?>
179 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
180 -<pkgmetadata>
181 - <maintainer type="project">
182 - <email>sci-biology@g.o</email>
183 - <name>Gentoo Biology Project</name>
184 - </maintainer>
185 - <upstream>
186 - <remote-id type="sourceforge">emboss</remote-id>
187 - </upstream>
188 -</pkgmetadata>