summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/gift/Manifest32
-rw-r--r--media-gfx/gift/files/digest-gift-0.1.15b3
-rw-r--r--media-gfx/gift/files/gift-0.1.14-extra_qualif.patch633
-rw-r--r--media-gfx/gift/files/gift-0.1.14-noDoc.patch11
-rw-r--r--media-gfx/gift/files/gift-0.1.14-patch-tid.patch74
-rw-r--r--media-gfx/gift/files/gift-0.1.14-ps_params.patch11
-rw-r--r--media-gfx/gift/files/gift.confd9
-rw-r--r--media-gfx/gift/files/gift.initd32
-rw-r--r--media-gfx/gift/gift-0.1.15b.ebuild61
9 files changed, 0 insertions, 866 deletions
diff --git a/media-gfx/gift/Manifest b/media-gfx/gift/Manifest
deleted file mode 100644
index 8267917..0000000
--- a/media-gfx/gift/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
-AUX gift-0.1.14-extra_qualif.patch 19935 RMD160 73fc7b93da757c8eb0f83b073124d66e2a961e1e SHA1 2d1bf1db502319d8afe4d8f491df8476e2d41ffd SHA256 6e532ddeb3a13bfa35248305e1f16d5a45a88e01bb3afa418de4017d7a129bda
-MD5 b36a63947600425666da712cea9bf09a files/gift-0.1.14-extra_qualif.patch 19935
-RMD160 73fc7b93da757c8eb0f83b073124d66e2a961e1e files/gift-0.1.14-extra_qualif.patch 19935
-SHA256 6e532ddeb3a13bfa35248305e1f16d5a45a88e01bb3afa418de4017d7a129bda files/gift-0.1.14-extra_qualif.patch 19935
-AUX gift-0.1.14-noDoc.patch 421 RMD160 9e8ecd717dc6009d1b58cfcec0f93210528da5ac SHA1 1ec9455b7bfa2f04bb45cc44006db14c29b301b8 SHA256 29416b0f386094b7fa428f3d4c03e069c9e1a57816288d8cf0551578a9dfde13
-MD5 9c4472bf47cc0daf89a040d966c25660 files/gift-0.1.14-noDoc.patch 421
-RMD160 9e8ecd717dc6009d1b58cfcec0f93210528da5ac files/gift-0.1.14-noDoc.patch 421
-SHA256 29416b0f386094b7fa428f3d4c03e069c9e1a57816288d8cf0551578a9dfde13 files/gift-0.1.14-noDoc.patch 421
-AUX gift-0.1.14-patch-tid.patch 2080 RMD160 479fc5920dffa726e120aa836b6fad05346931ed SHA1 ec632f6f19ce2b0fc816e6ec7efae1ab1be69d15 SHA256 077f1953e10ee451aa4781cd6df4840b57396a8a842e5f9c00e354dfd2437174
-MD5 2210f3d39978d05aa3aaa66ea5855c48 files/gift-0.1.14-patch-tid.patch 2080
-RMD160 479fc5920dffa726e120aa836b6fad05346931ed files/gift-0.1.14-patch-tid.patch 2080
-SHA256 077f1953e10ee451aa4781cd6df4840b57396a8a842e5f9c00e354dfd2437174 files/gift-0.1.14-patch-tid.patch 2080
-AUX gift-0.1.14-ps_params.patch 354 RMD160 3b6f3794a52c23ff62ebdacb62623ae3443b063f SHA1 046abded4dfc2b78b89483d3b5a10fca2164984c SHA256 256c409430453de0d0bd96b37c651d3787c574a89051dedcfaface192ac474aa
-MD5 0bf1285d1fa049d27d8f38a459f6ef5c files/gift-0.1.14-ps_params.patch 354
-RMD160 3b6f3794a52c23ff62ebdacb62623ae3443b063f files/gift-0.1.14-ps_params.patch 354
-SHA256 256c409430453de0d0bd96b37c651d3787c574a89051dedcfaface192ac474aa files/gift-0.1.14-ps_params.patch 354
-AUX gift.confd 109 RMD160 b9e43d6f22e3f633ee4c0b86fb4bc625aec38d67 SHA1 7204897edab0e4448b593d985572685d5342ef27 SHA256 20405bd1b1c462969c2fe0fb1f7ca75900391eae1dc7d04e2c379db308600699
-MD5 3d388561fbc512cd9e224f847f2f262a files/gift.confd 109
-RMD160 b9e43d6f22e3f633ee4c0b86fb4bc625aec38d67 files/gift.confd 109
-SHA256 20405bd1b1c462969c2fe0fb1f7ca75900391eae1dc7d04e2c379db308600699 files/gift.confd 109
-AUX gift.initd 566 RMD160 880180bc482883eab30d869cb55e246eec19b893 SHA1 51390dee015a254b3dc6c16d82f7b603db98ee6d SHA256 c978d2142cbc2073521b43b73c0a773b3c7e3925be1ebb4c0b41c3d30188c1f9
-MD5 32638ba8e58c5021fe1e2533c1d3ac6c files/gift.initd 566
-RMD160 880180bc482883eab30d869cb55e246eec19b893 files/gift.initd 566
-SHA256 c978d2142cbc2073521b43b73c0a773b3c7e3925be1ebb4c0b41c3d30188c1f9 files/gift.initd 566
-DIST gift-0.1.15b.tar.gz 802968 RMD160 282b3e4d7961ef4c5f1d6c14d080246f2a0d8251 SHA1 d2d05ba3a68a3a8956df61c7b4694354226994c8 SHA256 fdbcd212b69d146287572bac47ae33aeb30e612af4cf4133ac24aaaaabeb698f
-EBUILD gift-0.1.15b.ebuild 1306 RMD160 6f0ffa84ecbb1777f034ffab66a53672a7d7c915 SHA1 61d7310308599e3055ebffe7abe43353b4ada653 SHA256 85f920a00010025bdfc10cfa8716af23fc2645bb492871dd7dc978de495b45ab
-MD5 ebac6ce48e7a0636653c8fa6032ddf6b gift-0.1.15b.ebuild 1306
-RMD160 6f0ffa84ecbb1777f034ffab66a53672a7d7c915 gift-0.1.15b.ebuild 1306
-SHA256 85f920a00010025bdfc10cfa8716af23fc2645bb492871dd7dc978de495b45ab gift-0.1.15b.ebuild 1306
-MD5 b30b657c2263fe8299e1f537d5af86f9 files/digest-gift-0.1.15b 238
-RMD160 49ae7dfdff717a9f200cf4b4dc90f6011784643e files/digest-gift-0.1.15b 238
-SHA256 ea5fb107faec0f0400b90ebd50364c1582e7a28835d8e27c3904eb716713758c files/digest-gift-0.1.15b 238
diff --git a/media-gfx/gift/files/digest-gift-0.1.15b b/media-gfx/gift/files/digest-gift-0.1.15b
deleted file mode 100644
index 9f9ba9e..0000000
--- a/media-gfx/gift/files/digest-gift-0.1.15b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8423354877e0bdb373276c177e0cb127 gift-0.1.15b.tar.gz 802968
-RMD160 282b3e4d7961ef4c5f1d6c14d080246f2a0d8251 gift-0.1.15b.tar.gz 802968
-SHA256 fdbcd212b69d146287572bac47ae33aeb30e612af4cf4133ac24aaaaabeb698f gift-0.1.15b.tar.gz 802968
diff --git a/media-gfx/gift/files/gift-0.1.14-extra_qualif.patch b/media-gfx/gift/files/gift-0.1.14-extra_qualif.patch
deleted file mode 100644
index 329a276..0000000
--- a/media-gfx/gift/files/gift-0.1.14-extra_qualif.patch
+++ /dev/null
@@ -1,633 +0,0 @@
-diff -Nur gift-0.1.14.orig/libMRML/include/CAttributeList.h gift-0.1.14/libMRML/include/CAttributeList.h
---- gift-0.1.14.orig/libMRML/include/CAttributeList.h 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14/libMRML/include/CAttributeList.h 2007-05-13 09:31:05.000000000 +0200
-@@ -79,7 +79,7 @@
- virtual pair<bool,string> stringReadAttribute(const string& inAttribute)const;
- /** Outputting a string to XML
- */
-- void CAttributeList::toXML(string& outString)const;
-+ void toXML(string& outString)const;
- /** the destructor
- in the case of char* as content it deletes the arrays of char.
- */
-diff -Nur gift-0.1.14.orig/libMRML/include/CAccessorAdmin.h gift-0.1.14/libMRML/include/CAccessorAdmin.h
---- gift-0.1.14.orig/libMRML/include/CAccessorAdmin.h 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14/libMRML/include/CAccessorAdmin.h 2007-05-13 10:28:58.000000000 +0200
-@@ -111,11 +111,11 @@
- /** destructor */
- ~CAccessorAdmin();
- /** */
-- string CAccessorAdmin::getAlgorithmIDListID()const;
-+ string getAlgorithmIDListID()const;
- /** */
-- string CAccessorAdmin::getName()const;
-+ string getName()const;
- /** */
-- string CAccessorAdmin::getID()const;
-+ string getID()const;
-
- /** for sorting */
- friend class CSortByName_pAP;
-diff -Nur gift-0.1.14.orig/libMRML/include/CI18nTranslator.h gift-0.1.14/libMRML/include/CI18nTranslator.h
---- gift-0.1.14.orig/libMRML/include/CI18nTranslator.h 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14/libMRML/include/CI18nTranslator.h 2007-05-13 10:33:58.000000000 +0200
-@@ -98,11 +98,11 @@
- void translateXMLTree(string inLanguageCode,
- CXMLElement& inoutToBeTranslated)const;
- /** for parsing the config file */
-- static void CI18nTranslator::startXMLElement(void *inUserData,
-+ static void startXMLElement(void *inUserData,
- const char *inElementName,
- const char **inAttributes);
- /** for parsing the config file */
-- static void CI18nTranslator::endXMLElement(void *inUserData,
-+ static void endXMLElement(void *inUserData,
- const char *inElementName);
- };
- #endif
-diff -Nur gift-0.1.14.orig/libMRML/include/CSessionManager.h gift-0.1.14/libMRML/include/CSessionManager.h
---- gift-0.1.14.orig/libMRML/include/CSessionManager.h 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14/libMRML/include/CSessionManager.h 2007-05-13 10:34:50.000000000 +0200
-@@ -172,18 +172,18 @@
- bool rename(const string& inName);
- /** the list of preferred languages of this
- is cleared */
-- void CSession::clearLanguages();
-+ void clearLanguages();
- /** one language code is added at the back of the list
- of preferred languages */
-- void CSession::addLanguage(string inLanguageCode);
-+ void addLanguage(string inLanguageCode);
- /** commit the list of languages. That means, here the
- actual language that will be used throughout the
- translation is determined */
-- void CSession::commitLanguages(const CI18nTranslator& inTranslator);
-+ void commitLanguages(const CI18nTranslator& inTranslator);
- /** get the preferred languages of this session */
- list<string> CSession::getLanguages()const;
- /** get the preferred languages of this session */
-- string CSession::getPreferredLanguage()const;
-+ string getPreferredLanguage()const;
-
- //--------------------------------------------------
- /** generating XML output for configuration/shandshake */
-@@ -420,7 +420,7 @@
- /** i18n: get the list of preferred languages of this session */
- list<string> getSessionLanguages(const string& inSessionID)const;
- /** i18n: get the list of preferred languages of this session */
-- void CSessionManager::translate(string inSessionID,
-+ void translate(string inSessionID,
- CXMLElement& inoutToBeTranslated)const;
- };
-
-diff -Nur gift-0.1.14.orig/libMRML/include/CSessionManager.h gift-0.1.14/libMRML/include/CSessionManager.h
---- gift-0.1.14.orig/libMRML/include/CSessionManager.h 2007-05-13 10:35:39.000000000 +0200
-+++ gift-0.1.14/libMRML/include/CSessionManager.h 2007-05-13 11:21:01.000000000 +0200
-@@ -181,7 +181,7 @@
- translation is determined */
- void commitLanguages(const CI18nTranslator& inTranslator);
- /** get the preferred languages of this session */
-- list<string> CSession::getLanguages()const;
-+ list<string> getLanguages()const;
- /** get the preferred languages of this session */
- string getPreferredLanguage()const;
-
-diff -Nur gift-0.1.14.orig/libMRML/cc/CAttributeList.cc gift-0.1.14/libMRML/cc/CAttributeList.cc
---- gift-0.1.14.orig/libMRML/cc/CAttributeList.cc 2005-03-24 10:18:15.000000000 +0100
-+++ gift-0.1.14/libMRML/cc/CAttributeList.cc 2007-05-13 11:30:47.000000000 +0200
-@@ -94,7 +94,7 @@
-
- if(strcmp(i->second.first,
- i->second.second)){
-- cout << "DELETING FAILED" << flush << int(i->second.second) << flush << i->second.first << i->second.second << endl;
-+ cout << "DELETING FAILED" << flush << i->second.second << flush << i->second.first << i->second.second << endl;
- assert(0);
- }
- delete[] i->second.first;
-diff -Nur gift-0.1.14.orig/libMRML/cc/CAttributeList.cc~ gift-0.1.14/libMRML/cc/CAttributeList.cc~
---- gift-0.1.14.orig/libMRML/cc/CAttributeList.cc~ 1970-01-01 01:00:00.000000000 +0100
-+++ gift-0.1.14/libMRML/cc/CAttributeList.cc~ 2005-03-24 10:18:15.000000000 +0100
-@@ -0,0 +1,418 @@
-+// -*- mode: c++ -*-
-+/*
-+
-+ GIFT, a flexible content based image retrieval system.
-+ Copyright (C) 1998, 1999, 2000, 2001, 2002, CUI University of Geneva
-+
-+ Copyright (C) 2003, 2004 Bayreuth University
-+ 2005 Bamberg University
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+*/
-+#include "libMRML/include/CAttributeList.h"
-+#include "string.h"
-+#include <cstdio>
-+#include "libMRML/include/CMutex.h"
-+#include <iostream>
-+#include <algorithm>
-+extern CMutex* gMutex;
-+
-+CAttributeList::CAttributeList(const char * const * const inAttributeList){
-+ clear();
-+ if(inAttributeList){
-+ const char*const* lAttributes(inAttributeList);
-+ while(lAttributes[0] && strlen(lAttributes[0])){
-+ if(strlen(lAttributes[0])>200){
-+ cerr << __FILE__ << ":"
-+ << __LINE__ << ":" << flush
-+ << "lAttributes[0] too long:[" << endl
-+ << lAttributes[0]
-+ << "]ENDOF STRING"
-+ << endl;
-+ };//for debugging purposes DEBUG
-+ if(strlen(lAttributes[1])>200){
-+ cerr << __FILE__ << ":"
-+ << __LINE__ << ":" << flush
-+ << "lAttributes[1] too long:[" << endl
-+ << lAttributes[1]
-+ << "]ENDOF STRING"
-+ << endl;
-+ };//for debugging purposes DEBUG
-+#ifndef _IS_SEQUENCE_AL
-+ gMutex->lock();
-+ if(lAttributes[1]){
-+ // cout << "[L" << strlen(lAttributes[1]) << "L]" << flush;
-+ if(strlen(lAttributes[1])){
-+
-+ int lLen(strlen(lAttributes[1])+1);
-+ char* lBuffer(new char[lLen]);
-+ strcpy(lBuffer,lAttributes[1]);
-+ char* lBuffer2(new char[lLen]);
-+ strcpy(lBuffer2,lAttributes[1]);
-+
-+ insert(make_pair(lAttributes[0],
-+ make_pair(lBuffer,lBuffer2)));
-+
-+ //cout << "[" << lBuffer << "]" << flush;
-+ assert(strlen(operator[](lAttributes[0]).second)==lLen-1);
-+ assert(strlen(operator[](lAttributes[0]).first)==lLen-1);
-+ }else{
-+ char* lBuffer(new char[1]);
-+ lBuffer[0]=char(0);
-+ char* lBuffer2(new char[1]);
-+ lBuffer2[0]=char(0);
-+ insert(make_pair(string(lAttributes[0]),
-+ make_pair(lBuffer,lBuffer2)));
-+ }
-+ }
-+ gMutex->unlock();
-+#else
-+ push_back(make_pair(string(lAttributes[0]),
-+ string((lAttributes[1] && strlen(lAttributes[1]))?lAttributes[1]:"")));
-+#endif
-+ lAttributes+=2;
-+ }
-+ }
-+}
-+CAttributeList::~CAttributeList(){
-+ //checkNPrint();
-+ for(iterator i=begin();
-+ i!=end();
-+ i++){
-+
-+ if(strcmp(i->second.first,
-+ i->second.second)){
-+ cout << "DELETING FAILED" << flush << int(i->second.second) << flush << i->second.first << i->second.second << endl;
-+ assert(0);
-+ }
-+ delete[] i->second.first;
-+ delete[] i->second.second;
-+ }
-+}
-+
-+CAttributeList::CAttributeList(const list<pair <string,string> >& inAttributes){
-+ gMutex->lock();
-+
-+ clear();
-+ for(list<pair <string,string> >::const_iterator i=inAttributes.begin();
-+ i!=inAttributes.end();
-+ i++){
-+ if(i->second.size()>200){
-+ cerr << __FILE__ << ":"
-+ << __LINE__ << ":" << flush
-+ << "i->second too long:[" << endl
-+ << i->second
-+ << "]ENDOF STRING"
-+ << endl;
-+ }
-+#ifndef _IS_SEQUENCE_AL
-+ int lLen(i->second.size()+1);
-+ char* lBuffer(new char[lLen]);
-+ strcpy(lBuffer,i->second.c_str());
-+ char* lBuffer2(new char[lLen]);
-+ strcpy(lBuffer2,i->second.c_str());
-+ insert(make_pair(i->first,
-+ make_pair(lBuffer,
-+ lBuffer2)));
-+
-+ // insert(*i); if the representation is map<string,string>
-+#else
-+ push_back(*i);
-+#endif
-+ }
-+ gMutex->unlock();
-+}
-+CAttributeList::CAttributeList(const CAttributeList& inAttributes){
-+ gMutex->lock();
-+ clear();
-+ for(CAttributeList::const_iterator i=inAttributes.begin();
-+ i!=inAttributes.end();
-+ i++){
-+#ifndef _IS_SEQUENCE_AL
-+ if(strcmp(i->second.first,
-+ i->second.second)){
-+ if(strcmp(i->second.first,
-+ i->second.second)){
-+ cout << "ASSERTION FAILED" << i->second.first << "/" << i->second.second << endl;
-+ assert(0);
-+ }
-+ }
-+ assert(!strcmp(i->second.first,
-+ i->second.second));
-+ int lLen(strlen(i->second.first)+1);
-+ char* lBuffer(new char[lLen]);
-+ strcpy(lBuffer,i->second.first);
-+ int lLen2(strlen(i->second.second)+1);
-+ char* lBuffer2(new char[lLen2]);
-+ strcpy(lBuffer2,i->second.second);
-+
-+ insert(make_pair(i->first,make_pair(lBuffer,lBuffer2)));
-+#else
-+ push_back(*i);
-+#endif
-+ }
-+ gMutex->unlock();
-+}
-+CAttributeList::const_iterator CAttributeList::find(string inString)const{
-+ //check();
-+
-+#ifdef _PRINTOUTS_AL
-+ cout << endl
-+ << "CAttributeList::find("
-+ << flush;
-+ cout << inString
-+ << ") size " << flush;
-+ cout << size()
-+ << " "
-+ << inString.size()
-+ << endl;
-+#endif
-+
-+#ifndef _CAL_FIND_WORKAROUND
-+ return CAttributeList::CBase::find(inString);
-+#else
-+ for(const_iterator i=begin();
-+ i!=end();
-+ i++){
-+#ifdef _PRINTOUTS_AL
-+ cout << "~" << flush;
-+ cout << "[" << flush;
-+ cout << i->first <<flush;
-+ cout << "," << flush;
-+ cout << i->second << flush;
-+ cout << "]" << flush;
-+#endif
-+
-+ if(i->first==inString){
-+#ifdef _PRINTOUTS_AL
-+ cout << "+" << flush;
-+#endif
-+ return i;
-+ }
-+#ifdef _PRINTOUTS_AL
-+ cout << "." << flush;
-+#endif
-+ }
-+ cout << "-" << flush;
-+ return end();
-+#endif
-+}
-+void CAttributeList::add(const string& inFirst,
-+ const string& inSecond){
-+ gMutex->lock();
-+
-+
-+#ifdef _PRINTOUTS_AL
-+ checkNPrint();
-+ cout << "Adding to CAttributeList "
-+ << inFirst
-+ << " "
-+ << inSecond
-+ << endl;
-+#endif
-+
-+#ifndef _IS_SEQUENCE_AL
-+ char* lBuffer=new char[inSecond.size()+1];
-+ lBuffer[inSecond.size()]=char(0);
-+ strncpy(lBuffer,inSecond.c_str(),inSecond.size());
-+ char* lBuffer1=new char[inSecond.size()+1];
-+ lBuffer1[inSecond.size()]=char(0);
-+ strncpy(lBuffer1,inSecond.c_str(),inSecond.size());
-+
-+ operator[](inFirst)=make_pair(lBuffer,lBuffer1);
-+ // (*this).insert(make_pair(inFirst,inSecond));
-+#else
-+ (*this).push_back(make_pair(inFirst,inSecond));
-+#endif
-+ gMutex->unlock();
-+}
-+/** adding an attribute for integers */
-+void CAttributeList::add(const string& inAttribute,long inValue){
-+ char lBuffer[20];
-+ for(int i=0;
-+ i<20;
-+ i++){
-+ lBuffer[i]=0;
-+ }
-+ sprintf(lBuffer,
-+ "%ld",
-+ inValue);
-+ add(inAttribute,
-+ lBuffer);
-+};
-+/** adding an attribute for doubles */
-+void CAttributeList::add(const string& inAttribute,double inValue){
-+ char lBuffer[20];
-+
-+ for(int i=0;
-+ i<20;
-+ i++){
-+ lBuffer[i]=0;
-+ }
-+ sprintf(lBuffer,
-+ "%lf",
-+ inValue);
-+ add(inAttribute,
-+ lBuffer);
-+};
-+
-+/** reading an attribute for integers */
-+pair<bool,bool> CAttributeList::boolReadAttribute(const string& inAttribute)const{
-+ pair<bool,string> lReadAttribute=stringReadAttribute(inAttribute);
-+
-+ if(!lReadAttribute.first){
-+ return make_pair(bool(0),bool(0));
-+ }else{
-+ char* lLastCorrectCharacter=0;
-+
-+ bool lReturnValue=((lReadAttribute.second=="yes")
-+ ||
-+ (lReadAttribute.second=="y")
-+ ||
-+ (lReadAttribute.second=="true")
-+ ||
-+ (lReadAttribute.second=="t"));
-+ return make_pair(lReadAttribute.first,
-+ lReturnValue);
-+ }
-+};
-+/** reading an attribute for integers */
-+pair<bool,long> CAttributeList::longReadAttribute(const string& inAttribute)const{
-+ pair<bool,string> lReadAttribute=stringReadAttribute(inAttribute);
-+
-+ if(!lReadAttribute.first){
-+ return make_pair(bool(0),long(0));
-+ }else{
-+ char* lLastCorrectCharacter=0;
-+
-+ long lReturnValue=strtol(lReadAttribute.second.c_str(),
-+ &lLastCorrectCharacter,
-+ 10);
-+ bool lIsValid=!(*lLastCorrectCharacter);
-+
-+ return make_pair(lIsValid,
-+ lReturnValue);
-+ }
-+};
-+/** reading an attribute for doubles */
-+pair<bool,double> CAttributeList::doubleReadAttribute(const string& inAttribute)const{
-+#ifdef __D_CATTRIBUTELIST__DOUBLEREADATTRIBUTE__
-+ cout << "In doubleReadAttribute "
-+ << flush
-+ << endl;
-+#endif
-+
-+ pair<bool,string> lReadAttribute=stringReadAttribute(inAttribute);
-+
-+#ifdef __D_CATTRIBUTELIST__DOUBLEREADATTRIBUTE__
-+ cout << "AGAIN In doubleReadAttribute "
-+ << flush
-+ << endl;
-+#endif
-+
-+ if(!lReadAttribute.first){
-+ return make_pair(bool(0),
-+ double(0));
-+ }else{
-+ char* lLastCorrectCharacter=0;
-+
-+ double lReturnValue=strtod(lReadAttribute.second.c_str(),
-+ &lLastCorrectCharacter);
-+ bool lIsValid=!(*lLastCorrectCharacter);
-+
-+ return make_pair(lIsValid,
-+ lReturnValue);
-+ }
-+};
-+/** reading an attribute for strings */
-+pair<bool,string> CAttributeList::stringReadAttribute(const string& inAttribute)const{
-+
-+ //check, if the magic number is correct at this time
-+
-+#ifdef _PRINTOUTS_AL
-+ checkNPrint();
-+ cout << inAttribute
-+ << endl
-+ << flush;
-+#endif
-+
-+#ifdef _PRINTOUTS_AL
-+ find(inAttribute);
-+ cout << "came back from find()" << flush;
-+#endif
-+
-+ CAttributeList::const_iterator lFoundPosition(find(inAttribute));
-+
-+#ifdef _PRINTOUTS_AL
-+ cout << "came back 2nd time from mAttributes.find()" << flush;
-+#endif
-+
-+ if(lFoundPosition != end()){
-+ assert(!strcmp(lFoundPosition->second.first,
-+ lFoundPosition->second.second));
-+
-+ string lFoundString(lFoundPosition->second.first);
-+
-+ pair<bool,string> lReturnValue=make_pair(bool(1),
-+ lFoundString);
-+ return lReturnValue;
-+ }
-+ return make_pair(bool(0),
-+ string(""));
-+};
-+/** reading an attribute for strings */
-+void CAttributeList::toXML(string& outString)const{
-+ outString += " ";
-+ for(const_iterator i=begin();
-+ i!=end();
-+ i++){
-+ outString += i->first + "=\"" + i->second.first + "\" ";
-+ assert(!strcmp(i->second.second,
-+ i->second.first));
-+ }
-+};
-+/** reading an attribute for strings */
-+void CAttributeList::check()const{
-+ for(const_iterator i=begin();
-+ i!=end();
-+ i++){
-+ assert(!strcmp(i->second.second,
-+ i->second.first));
-+ }
-+};
-+/** a local function */
-+template<typename T>
-+static const string& _CAL_getFirst(const pair<string, T>& inElement){
-+ return inElement.first;
-+}
-+
-+/** Get the keys of all attributes in this list*/
-+list<string> CAttributeList::getKeys()const{
-+ list<string> lReturnValue;
-+ // the following two implementations are equivalent
-+ transform(this->begin(),
-+ this->end(),
-+ back_inserter(lReturnValue),
-+ _CAL_getFirst<CAttributeList::mapped_type>
-+ );
-+// #ifdef GCC30
-+// for(const_iterator i=begin();
-+// i!=end();
-+// i++){
-+// lReturnValue.push_back(i->first);
-+// }
-+// #endif
-+ return lReturnValue;
-+}
-diff -Nur gift-0.1.14.orig/libGIFTAcInvertedFile/include/CInvertedFileChunk.h gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h
---- gift-0.1.14.orig/libGIFTAcInvertedFile/include/CInvertedFileChunk.h 2005-03-24 10:18:15.000000000 +0100
-+++ gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h 2007-05-13 11:39:54.000000000 +0200
-@@ -73,7 +73,7 @@
- * add one document of to the list for one feature
- *
- */
-- void CInvertedFileChunk::addElement(TID inDocumentID,
-+ void addElement(TID inDocumentID,
- double inDocumentFrequency);
-
- /**
-diff -Nur gift-0.1.14.orig/libGIFTAcInvertedFile/include/CInvertedFileChunk.h~ gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h~
---- gift-0.1.14.orig/libGIFTAcInvertedFile/include/CInvertedFileChunk.h~ 1970-01-01 01:00:00.000000000 +0100
-+++ gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h~ 2005-03-24 10:18:15.000000000 +0100
-@@ -0,0 +1,89 @@
-+/* -*- mode: c++ -*-
-+*/
-+/*
-+
-+ GIFT, a flexible content based image retrieval system.
-+ Copyright (C) 1998, 1999, 2000, 2001, 2002, CUI University of Geneva
-+
-+ Copyright (C) 2003, 2004 Bayreuth University
-+ 2005 Bamberg University
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+*/
-+// -*- mode: c++ -*-
-+/**
-+*
-+* CInvertedFileChunk
-+*
-+*
-+*
-+* modification history:
-+*
-+* HM 090399 created the documentation
-+*
-+*
-+*
-+* compiler defines used:
-+*
-+*
-+*/
-+#ifndef _CINVERTEDFILECHUNK
-+#define _CINVERTEDFILECHUNK
-+#include "libGIFTAcInvertedFile/include/uses-declarations.h"
-+#include <iostream>
-+#include <fstream>
-+#include "libMRML/include/TID.h"
-+#include <map>
-+#include "libGIFTAcInvertedFile/include/CDocumentFrequencyList.h"
-+
-+
-+/** */
-+class CMapInvertedFileChunk:public map<TID,double>{};
-+
-+
-+/** A class which does all the necessary administrative
-+ work for generating inverted files. It contains the list of
-+ documents which contain a given feature */
-+class CInvertedFileChunk:public CMapInvertedFileChunk{
-+
-+public:
-+
-+/**
-+ *
-+ * returns the percentage of documents which contain this one feature
-+ *
-+ */
-+
-+ double getCollectionFrequency(size_t inSize)const;
-+
-+/**
-+ *
-+ * add one document of to the list for one feature
-+ *
-+ */
-+ void CInvertedFileChunk::addElement(TID inDocumentID,
-+ double inDocumentFrequency);
-+
-+/**
-+ *
-+ * writes the binary part of the list for one feature
-+ *
-+ */
-+ bool writeBinary(ostream&,
-+ TID inFeatureID,
-+ size_t inSize)const;
-+};
-+
-+#endif
diff --git a/media-gfx/gift/files/gift-0.1.14-noDoc.patch b/media-gfx/gift/files/gift-0.1.14-noDoc.patch
deleted file mode 100644
index aacf2a4..0000000
--- a/media-gfx/gift/files/gift-0.1.14-noDoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gift-0.1.14.orig/Makefile.am 2002-11-05 17:30:40.000000000 +0100
-+++ gift-0.1.14/Makefile.am 2004-04-19 23:50:55.152365064 +0200
-@@ -20,7 +20,7 @@
- #gift-config.cc: gift-config.cc.in make-gift-config.pl
- # perl make-gift-config.pl CXXFLAGS "$(CXXFLAGS)" LDFLAGS "$(LDFLAGS)" libdir "-l $(libdir)" < $< > $@
-
--SUBDIRS= Doc scripts dtd \
-+SUBDIRS= scripts dtd \
- @UNPUBLISHED_DIR@ \
- libMRML \
- libGIFTAcURL2FTS\
diff --git a/media-gfx/gift/files/gift-0.1.14-patch-tid.patch b/media-gfx/gift/files/gift-0.1.14-patch-tid.patch
deleted file mode 100644
index 41b1844..0000000
--- a/media-gfx/gift/files/gift-0.1.14-patch-tid.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -u -r gift-0.1.14/libGIFTAcPerl/cc/CAcPerl.cc gift-0.1.14-test/libGIFTAcPerl/cc/CAcPerl.cc
---- gift-0.1.14/libGIFTAcPerl/cc/CAcPerl.cc 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14-test/libGIFTAcPerl/cc/CAcPerl.cc 2005-11-22 10:09:22.000000000 +0100
-@@ -57,26 +57,26 @@
- /**
- *
- */
--string CAcPerl::IDToURL(long int) const{
-+string CAcPerl::IDToURL(TID) const{
- assert(0);
- return "this function should never be called";
- };
- /**
- *
- */
--struct pair<bool,CAccessorElement> CAcPerl::IDToAccessorElement(long int) const{
-+struct pair<bool,CAccessorElement> CAcPerl::IDToAccessorElement(TID) const{
- return(make_pair(bool(0),CAccessorElement(0,"null","null","null")));
- };
- /**
- *
- */
--struct pair<bool,long int> CAcPerl::URLToID(const string &) const{
-+struct pair<bool, TID> CAcPerl::URLToID(const string &) const{
- return(make_pair(bool(0),0));
- };
- /**
- *
- */
--void CAcPerl::getAllIDs(list<long int > &) const{
-+void CAcPerl::getAllIDs(list<TID > &) const{
- assert(0);
- };
- /**
-@@ -88,7 +88,7 @@
- /**
- *
- */
--void CAcPerl::getRandomIDs(list<long int > &, unsigned int) const{
-+void CAcPerl::getRandomIDs(list<TID > &, unsigned int) const{
- assert(0);
- };
- /**
-diff -u -r gift-0.1.14/libGIFTAcPerl/include/CAcPerl.h gift-0.1.14-test/libGIFTAcPerl/include/CAcPerl.h
---- gift-0.1.14/libGIFTAcPerl/include/CAcPerl.h 2005-03-24 10:18:16.000000000 +0100
-+++ gift-0.1.14-test/libGIFTAcPerl/include/CAcPerl.h 2005-11-22 10:09:28.000000000 +0100
-@@ -114,15 +114,15 @@
- /**
- *
- */
-- string IDToURL(long int) const;
-+ string IDToURL(TID) const;
- /**
- *
- */
-- struct pair<bool,CAccessorElement> IDToAccessorElement(long int) const;
-+ struct pair<bool,CAccessorElement> IDToAccessorElement(TID) const;
- /**
- *
- */
-- struct pair<bool,long int> URLToID(const string &) const;
-+ struct pair<bool, TID> URLToID(const string &) const;
- /**
- *
- */
-@@ -134,7 +134,7 @@
- /**
- *
- */
-- void getRandomIDs(list<long int > &, unsigned int) const;
-+ void getRandomIDs(list<TID > &, unsigned int) const;
- /**
- *
- */
diff --git a/media-gfx/gift/files/gift-0.1.14-ps_params.patch b/media-gfx/gift/files/gift-0.1.14-ps_params.patch
deleted file mode 100644
index 03e2dda..0000000
--- a/media-gfx/gift/files/gift-0.1.14-ps_params.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gift-0.1.14.orig/scripts/perl/gift-start.pre-pl 2002-07-22 09:09:29.000000000 +0200
-+++ gift-0.1.14/scripts/perl/gift-start.pre-pl 2004-04-20 01:16:46.751203000 +0200
-@@ -103,7 +103,7 @@
-
- while(1){
- print "doing ps\n";
-- open PS,"ps -axww|" or die "could not ps";
-+ open PS,"ps axww|" or die "could not ps";
-
- my $lFound=0;
- my $lPID=0;
diff --git a/media-gfx/gift/files/gift.confd b/media-gfx/gift/files/gift.confd
deleted file mode 100644
index e1f2249..0000000
--- a/media-gfx/gift/files/gift.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/gift
-
-USER="gift"
-BASEDIR="/home/gift"
-HOST="localhost"
-PORT="12789"
-
-LOGFILE="/var/log/gift"
-
diff --git a/media-gfx/gift/files/gift.initd b/media-gfx/gift/files/gift.initd
deleted file mode 100644
index 93952fd..0000000
--- a/media-gfx/gift/files/gift.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop restart"
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting GNU Image-Finding Tool server"
- if [[ ! -e ${BASEDIR}/gift-config.mrml ]]; then
- einfo "First run... copying base files..."
- su ${USER} -c "cp /usr/share/gift/* ${BASEDIR}"
- fi
- start-stop-daemon --quiet --start -c ${USER} \
- -x /usr/bin/gift -- ${PORT} ${BASEDIR} &>${LOGFILE} &
- eend $?
-
-}
-
-stop() {
- ebegin "Stoping GNU Image-Finding Tool server"
- start-stop-daemon -o --stop -x /usr/bin/gift &>/dev/null
- eend $?
-}
-
-restart() {
- svc_stop
- sleep 2
- svc_start
-}
-
diff --git a/media-gfx/gift/gift-0.1.15b.ebuild b/media-gfx/gift/gift-0.1.15b.ebuild
deleted file mode 100644
index 2372fce..0000000
--- a/media-gfx/gift/gift-0.1.15b.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools
-
-DESCRIPTION="The GNU Image-Finding Tool"
-HOMEPAGE="http://www.gnu.org/software/gift/"
-SRC_URI="http://alpha.gnu.org/gnu/gift/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-gfx/imagemagick
- dev-perl/XML-DOM
- dev-perl/XML-XQL
- dev-perl/Text-Iconv"
-
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-
-GIFT_USER="gift"
-GIFT_HOME="/home/${GIFT_USER}/"
-GIFT_INIT="gnu-gift"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- use doc || epatch ${FILESDIR}/${PN}-0.1.14-noDoc.patch
- epatch ${FILESDIR}/${PN}-0.1.14-ps_params.patch
-# epatch ${FILESDIR}/${PN}-0.1.14-patch-tid.patch
- epatch ${FILESDIR}/${PN}-0.1.14-extra_qualif.patch
-}
-
-src_compile() {
-
- eautoreconf
-
-# econf --enable-multithreading \
-# --enable-bayesian \
-# --datadir=/usr/share/${PN} \
-# --includedir=/usr/include/${PN} || die "econf failed"
-
- econf --enable-multi-threading \
- --enable-bayesian || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR=${D} install || die
- dodoc README NEWS AUTHORS
-
- newconfd ${FILESDIR}/${PN}.confd ${GIFT_INIT}
- newinitd ${FILESDIR}/${PN}.initd ${GIFT_INIT}
-
- enewuser ${GIFT_USER} -1 /bin/bash ${GIFT_HOME} users
-}