gentoo resync : 15.02.2018

5 files changed, 0 insertions, 116 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 55d2af6de8f7..ca87b1c5c15b 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/xds-viewer/Manifest b/sci-visualization/xds-viewer/Manifest
deleted file mode 100644
index c432b1c89266..000000000000
--- a/sci-visualization/xds-viewer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xds-viewer-0.6-fix-c++14.patch 2139 BLAKE2B f866516641eb13c503539157dd71aae58c4d3909a38a088fad28278797e170b05ee9e7af704f7f4f98582a74316a9295f3fffeea911818c969c8e88dd9a51463 SHA512 2b6d1d5598a016c2806bd54a027b1b23bbfa78cca4e7293df9e80eef8fbed3b084f29d1c499670a5d4b83681c7761a13897c7ccbe78599f6a0bc1cb468121444
-DIST xds-viewer-0.6.tar.gz 408315 BLAKE2B e514746ec4936e1ac30bbc4054555a988b9739f0705510be2daffbb9f5d45c5e785ee283055e80f9fb7fe677fba01c88524d183906025cddeae392f86d909be2 SHA512 4a7798997147e569aeeabab958b41198da29d336273e4b16b8d3c8766f2a16256727e9620a91b8f202125c9f5daedbd37e79352bb563fd431475b806deb3629e
-EBUILD xds-viewer-0.6-r1.ebuild 566 BLAKE2B c7da7b79e3194ae710d0fd56b473539fffbe7e0199ea192cb2464e8f081fb5b706920b74f6ef29ca4b521688ffaa037d6b9df5be0237d1b0787ad6f939e652a3 SHA512 f85cc8c389b34a5f58a43b175c44363c1c9f6b3c06598a9a5ad9edc5da6e5745f580f0761981c5872d9da00913556243d442b3ed6fb93a8357bf48586bdff382
-MISC metadata.xml 985 BLAKE2B b87c1650a8a0506d039bfad459826d61503f62db0e20539a2337f5e08d7c16b587e29390deff7dca7b8f9cd18b61911d2615d49516a6f8b71b730d361bbe8a1e SHA512 4daebbf5c5b83c76c77ad12467dbb9a5593f6a693acfdc027da7d3b215f53cacf7d4f2f1cc61f13e152e66a19c62d3715151bd9893495d67915d76b4e9d98b0d
diff --git a/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch b/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
deleted file mode 100644
index 612b5038c845..000000000000
--- a/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Fix building with C++14, caused by invalid implicit T* -> bool conversions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=598126
-
---- a/src/CbfReader.cpp
-+++ b/src/CbfReader.cpp
-@@ -315,12 +315,12 @@
- 
- 	for ( int i = 0;i < nx*ny;i++ )
- 	{
--		if ( tapin.get( sc ) == 0 )return -4;
-+		if ( !tapin.get( sc ) )return -4;
- 		diff = sc;
- 		if ( diff == -128 )
- 		{
--			if ( tapin.get( uc0 ) == 0 )return -4;
--			if ( tapin.get( uc1 ) == 0 )return -4;
-+			if ( !tapin.get( uc0 ) )return -4;
-+			if ( !tapin.get( uc1 ) )return -4;
- 			tmp0 = uc0;
- 			if ( uc0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 			diff = uc1;
-@@ -329,15 +329,15 @@
- 			if ( diff > 32767 )diff -= 65536;
- 			if ( diff == -32768 )
- 			{
--				if ( tapin.get( uc0 ) == 0 )return -4;
--				if ( tapin.get( uc1 ) == 0 )return -4;
-+				if ( !tapin.get( uc0 ) )return -4;
-+				if ( !tapin.get( uc1 ) )return -4;
- 				tmp0 = uc0;
- 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 				tmp1 = uc1;
- 				if ( tmp1 < 0 ) tmp1 += 256; // converting signed to unsigned char
- 				diff = tmp0 + 256 * tmp1;
--				if ( tapin.get( uc0 ) == 0 )return -4;
--				if ( tapin.get( uc1 ) == 0 )return -4;
-+				if ( !tapin.get( uc0 ) )return -4;
-+				if ( !tapin.get( uc1 ) )return -4;
- 				tmp0 = uc0;
- 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 				tmp1 = uc1;
-@@ -359,7 +359,7 @@
- {
- 	std::ifstream::pos_type streamPos = tapin.tellg();
- 
--	char binaryMarker[5] = {12, 26, 4, 213, '\0'};
-+	char binaryMarker[5] = {12, 26, 4, (char)213, '\0'};
- 	char buffer[5] = {0, 0, 0, 0, '\0'};
- 
- 	bool equal = true;
-@@ -448,13 +448,13 @@
- 
- int CbfReader::checkImageFormat( std::ifstream& tapin )
- {
--	if ( tapin == 0 )return -2; // Cannot open image file
-+	if ( !tapin )return -2; // Cannot open image file
- 
- 	{ // Check image file format
- 		std::string s( "###CBF: " );
- 		char label[9];
- 		for ( int i = 0;i < 8;i++ )
--			if ( tapin.get( label[i] ) == false )return -4; // Cannot read image file
-+			if ( !tapin.get( label[i] ) )return -4; // Cannot read image file
- 		label[8] = '\0';
- 		std::string sLabel = ( std::string )label;
- 
diff --git a/sci-visualization/xds-viewer/metadata.xml b/sci-visualization/xds-viewer/metadata.xml
deleted file mode 100644
index 0177b9503629..000000000000
--- a/sci-visualization/xds-viewer/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  XDS-Viewer is a program for viewing X-ray diffraction and control
-  images in the context of data processing by the XDS Program Package
-  (external link). Potential users of the software are scientists
-  working in the field of crystallography. The XDS-Viewer is a
-  standalone program which has build-in support for a subset of the
-  Crystallographic Binary File Format CBF (external link). Other file
-  formats are supported through an external convertion program that
-  comes with XDS. XDS-Viewer will automatically invoke the convertion
-  program for images other than CBF. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">xds-viewer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild b/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
deleted file mode 100644
index f331c821dc71..000000000000
--- a/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="X-ray diffraction/control image viewer in the context of data processing by XDS"
-HOMEPAGE="http://xds-viewer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0=
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( src/doc/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-c++14.patch )