[gentoo-commits] repo/gentoo:master commit in: sci-libs/cifparse-obj/, sci-libs/cifparse-obj/files/

2021-02-18 Thread David Seifert 
commit: d4a45f2fad771b29f09e9cb969e6ae74d0f0fdb1
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Feb 18 18:55:43 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 18 18:55:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a45f2f

sci-libs/cifparse-obj: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/cifparse-obj/Manifest |   1 -
 sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild |  52 --
 .../files/cifparse-obj-7.025-gcc4.3.patch  |  87 
 .../files/cifparse-obj-7.025-gcc4.7.patch  |  64 
 .../files/cifparse-obj-7.025-makefile.patch| 115 -
 ...ifparse-obj-7.025-strncasecmp-declaration.patch |  16 ---
 6 files changed, 335 deletions(-)

diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index b6b72d03989..b4e1510dc6e 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,2 +1 @@
-DIST cifparse-obj-v7.025-prod-src.tar.gz 928484 BLAKE2B 
4f510f4826e235ecd87d81d51ceef84b717bb0c174f4a263cae44765bd0ddb35e2bb6edce1c5cadcf18c5e9892630f43cda2ca004f09d84dc44499d457eef5c1
 SHA512 
bf5d6b55592aca8678396eb9819f5bd7bff4d912410590dfb750c9ad85bdcdbd251425c45b67e2db027a8ce8d028b77c91edcc5333279ed1190f6049c01f5cc9
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B 
c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9
 SHA512 
d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4

diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild 
b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
deleted file mode 100644
index 44d186a798c..000
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-v${PV}-prod-src"
-
-DESCRIPTION="Provides an object-oriented application interface to information 
in mmCIF format"
-HOMEPAGE="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html";
-SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz";
-
-LICENSE="PDB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-   sys-devel/bison
-   sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-makefile.patch \
-   "${FILESDIR}"/${P}-gcc4.3.patch \
-   "${FILESDIR}"/${P}-gcc4.7.patch \
-   "${FILESDIR}"/${P}-gcc5_6.patch \
-   "${FILESDIR}"/${PN}-7.025-strncasecmp-declaration.patch
-
-   sed \
-   -e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-   -e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
-   -e "s:^\(F77=\).*:\1${FORTRANC}:g" \
-   -e "s:^\(F77_LINKER=\).*:\1${FORTRANC}:g" \
-   -e "s:-static::g" \
-   -i "${S}"/etc/make.* || die "Failed to fix makefile"
-}
-
-src_compile() {
-   # parallel make fails
-   emake -j1
-}
-
-src_install() {
-   dolib.a lib/*
-   insinto /usr/include/${PN}
-   doins include/*
-}

diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch 
b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
deleted file mode 100644
index 1715f493a6e..000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Naur cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C 
cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C
 cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C   2008-02-06 
07:17:50.0 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C   
2008-09-03 09:36:41.0 -0400
-@@ -153,6 +153,7 @@
- // VLAD - Carefully examine all methods that accept with, for cases where
- // with is 0. This may happen if the value is empty !!
- 
-+#include 
- #include "GenString.h"
- #include "CifString.h"
- #include "regex.h"
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C 
cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C
 cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C  
2008-02-06 07:17:51.0 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C  
2008-09-03 09:40:12.0 -0400
-@@ -1,4 +1,5 @@
- #include 
-+#include 
- #include "GenString.h"
- #include "CifFile.h"
- 
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C 
cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest7.C
 cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C  
2008-02-06 07:17:51.0 -0500
-+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cifparse-obj/, sci-libs/cifparse-obj/files/

2017-01-29 Thread Justin Lecher 
commit: a4c3d75c933b2f613769d5af3bf2931ce37f59bf
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Jan 29 13:47:10 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Jan 29 14:02:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c3d75c

sci-libs/cifparse-obj: Add support for gcc-6

drop old patch

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=607372

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild |   4 +-
 ...-gcc5.patch => cifparse-obj-7.025-gcc5_6.patch} |   2 +-
 .../files/respect-flags-and-add-gcc4.patch | 302 -
 3 files changed, 3 insertions(+), 305 deletions(-)

diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild 
b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
index 39d1762..f31c3c1 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ src_prepare() {
"${FILESDIR}"/${P}-makefile.patch \
"${FILESDIR}"/${P}-gcc4.3.patch \
"${FILESDIR}"/${P}-gcc4.7.patch \
-   "${FILESDIR}"/${P}-gcc5.patch \
+   "${FILESDIR}"/${P}-gcc5_6.patch \
"${FILESDIR}"/${PN}-7.025-strncasecmp-declaration.patch
 
sed \

diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch 
b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch
similarity index 90%
rename from sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch
rename to sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch
index 6b2f797..2ac0ec2 100644
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch
+++ b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5_6.patch
@@ -10,7 +10,7 @@ index ff0ab51..1b56ab1 100755
  Linux)
  # Check if it is GCC version 4.x
 -  gcc_ver=`gcc --version | grep -e " 4\."`
-+  gcc_ver=`gcc --version | grep -e " [45]\."`
++  gcc_ver=`gcc --version | grep -e " [456]\."`
if [[ -z $gcc_ver ]]
then
  #   It is not GCC version 4.x. Check if it is GCC version 3.x

diff --git a/sci-libs/cifparse-obj/files/respect-flags-and-add-gcc4.patch 
b/sci-libs/cifparse-obj/files/respect-flags-and-add-gcc4.patch
deleted file mode 100644
index 79d4914..
--- a/sci-libs/cifparse-obj/files/respect-flags-and-add-gcc4.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff -urN -x make.log -x Makefile.platform 
cifparse-obj-v6.302-prod-src.orig/etc/make.platform.gnu3 
cifparse-obj-v6.302-prod-src/etc/make.platform.gnu3
 cifparse-obj-v6.302-prod-src.orig/etc/make.platform.gnu3   2005-04-26 
06:12:57.0 -0700
-+++ cifparse-obj-v6.302-prod-src/etc/make.platform.gnu32005-12-18 
22:50:21.0 -0800
-@@ -107,8 +107,8 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-$(INCLUDES) 
- 
- ## C++ compiler
-@@ -125,12 +125,12 @@
- # This variable specifies how to compile the C code. If it is set to C,
- # that indicates that C code will be compiled with the C++ compiler.
- # Otherwise it will be compiled with C compiler.
--EXT=C
-+EXT=c
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
- $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) 
\
-  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
-@@ -144,7 +144,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-diff -urN -x make.log -x Makefile.platform 
cifparse-obj-v6.302-prod-src.orig/etc/make.platform.gnu4 
cifparse-obj-v6.302-prod-src/etc/make.platform.gnu4
 cifparse-obj-v6.302-prod-src.orig/etc/make.platform.gnu4   1969-12-31 
16:00:00.0 -0800
-+++ cifparse-obj-v6.302-prod-src/etc/make.platform.gnu42005-12-18 
22:55:17.0 -0800
-@@ -0,0 +1,202 @@
-+##
-+##
-+##  File:make.plaform.gnu4
-+##  Purpose: This file is a Linux platform makefile that supports GNU 4.x
-+##   compiler suite.
-+##
-+###

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cifparse-obj/, sci-libs/cifparse-obj/files/

2016-09-17 Thread David Seifert 
commit: da26589a40637b2f1fceef6180b3de18351a4610
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep 17 14:09:24 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep 17 14:11:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da26589a

sci-libs/cifparse-obj: Allow for compiling with GCC 6

Gentoo-bug: 594054
* Remove broken declarations of the 'strcasecmp'
  and 'strncasecmp' functions.

Package-Manager: portage-2.3.0

 sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild   |  5 +++--
 .../cifparse-obj-7.025-strncasecmp-declaration.patch | 16 
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild 
b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
index a30d3b4..39d1762 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,8 @@ src_prepare() {
"${FILESDIR}"/${P}-makefile.patch \
"${FILESDIR}"/${P}-gcc4.3.patch \
"${FILESDIR}"/${P}-gcc4.7.patch \
-   "${FILESDIR}"/${P}-gcc5.patch
+   "${FILESDIR}"/${P}-gcc5.patch \
+   "${FILESDIR}"/${PN}-7.025-strncasecmp-declaration.patch
 
sed \
-e "s:^\(CC=\).*:\1$(tc-getCC):g" \

diff --git 
a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch 
b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
new file mode 100644
index ..9222ff2
--- /dev/null
+++ 
b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
@@ -0,0 +1,16 @@
+Remove incorrect prototypes of the 'strcasecmp' and 'strncasecmp' functions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594054
+
+--- a/misclib-v2.2/include/ndb_misclib.h
 b/misclib-v2.2/include/ndb_misclib.h
+@@ -167,10 +167,6 @@
+ #define NDB_MSG_BUFFER_LEN20
+ 
+ 
+-#if !defined(HAVE_STRCASECMP)
+-int strcasecmp (const char *s1, const char *s2);
+-int strncasecmp (const char *s1, const char *s2, unsigned int n);
+-#endif 
+ /*
+  *   ndb_misclib.c prototypes
+  */