From d9c8973a36cfb43fb5a353895bdab5aa74fe2012 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 26 Jan 2007 14:08:13 +0000 Subject: [PATCH] drop old Package-Manager: portage-2.1.2-r4 --- net-p2p/knapster2/ChangeLog | 8 +- net-p2p/knapster2/Manifest | 19 +- net-p2p/knapster2/files/digest-knapster2-0.4 | 1 - net-p2p/knapster2/files/digest-knapster2-0.5 | 2 + .../knapster2/files/knapster2-0.4-gcc3.2.diff | 524 ------------------ net-p2p/knapster2/knapster2-0.4.ebuild | 23 - 6 files changed, 22 insertions(+), 555 deletions(-) delete mode 100644 net-p2p/knapster2/files/digest-knapster2-0.4 delete mode 100644 net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff delete mode 100644 net-p2p/knapster2/knapster2-0.4.ebuild diff --git a/net-p2p/knapster2/ChangeLog b/net-p2p/knapster2/ChangeLog index b4a2b7922a48..9b93a3b92837 100644 --- a/net-p2p/knapster2/ChangeLog +++ b/net-p2p/knapster2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/knapster2 -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/knapster2/ChangeLog,v 1.9 2004/08/14 14:52:13 swegener Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/knapster2/ChangeLog,v 1.10 2007/01/26 14:08:13 armin76 Exp $ + + 26 Jan 2007; Raúl Porcel + -files/knapster2-0.4-gcc3.2.diff, -knapster2-0.4.ebuild: + drop old 14 Aug 2004; Sven Wegener knapster2-0.4.ebuild, knapster2-0.5.ebuild: diff --git a/net-p2p/knapster2/Manifest b/net-p2p/knapster2/Manifest index cd1786df0999..d0053aeb73ca 100644 --- a/net-p2p/knapster2/Manifest +++ b/net-p2p/knapster2/Manifest @@ -1,7 +1,16 @@ -MD5 d6a45d0a7f219fde4d8c5e2ad951d372 ChangeLog 1209 -MD5 ab906f167334cfd37d3f264232e29dd2 knapster2-0.4.ebuild 540 +DIST knapster2-0.5.tar.gz 721990 RMD160 47697ab4b9b8d6b25f6b4296bcba704df5ce1736 SHA1 7a5272a98e0cf410fa417336f13b68507e292c88 SHA256 44aa6051f32bfcef55bf4b38e5e7025042c40cd5895827ab38e65e7b6fccb8c7 +EBUILD knapster2-0.5.ebuild 517 RMD160 7c70271fab4c760078bb17932a9fcf77a8d96637 SHA1 458da3bf1bb4b6d44f70dcd2b5f145f1ec2fe364 SHA256 4538c160d488989d49570510c1a619fe3f15c63dacd99e73872f30693d0a4c30 MD5 561959196b22aa052ae6112aecf8a3af knapster2-0.5.ebuild 517 +RMD160 7c70271fab4c760078bb17932a9fcf77a8d96637 knapster2-0.5.ebuild 517 +SHA256 4538c160d488989d49570510c1a619fe3f15c63dacd99e73872f30693d0a4c30 knapster2-0.5.ebuild 517 +MISC ChangeLog 1329 RMD160 57d162cced06fe9b158a2915908c4efad247ef59 SHA1 5ef124ec51274fd6832257c8c608f7bee5f843f7 SHA256 662b07859cdcfa31a31a2ac1c134a6b8488fdbd8973745a2eace6c6076fb3625 +MD5 d1630e0a040b2981a7d49f852fc177c6 ChangeLog 1329 +RMD160 57d162cced06fe9b158a2915908c4efad247ef59 ChangeLog 1329 +SHA256 662b07859cdcfa31a31a2ac1c134a6b8488fdbd8973745a2eace6c6076fb3625 ChangeLog 1329 +MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 -MD5 f070170f010493775166e99ad51360e9 files/digest-knapster2-0.4 65 -MD5 a66f99428528ab3e33c6ea806157c488 files/digest-knapster2-0.5 65 -MD5 6a69ca2de36cb1c0d360beae2dcf8690 files/knapster2-0.4-gcc3.2.diff 15623 +RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 +SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160 +MD5 e679c5202c9ac120b3493ab7202a2ce2 files/digest-knapster2-0.5 241 +RMD160 4f390ad05188ec904c5229a8c1d4b0ec686487fa files/digest-knapster2-0.5 241 +SHA256 af9ab1f97302e46635eb960673e63d96a3d037c22ad368f02f7f211957766082 files/digest-knapster2-0.5 241 diff --git a/net-p2p/knapster2/files/digest-knapster2-0.4 b/net-p2p/knapster2/files/digest-knapster2-0.4 deleted file mode 100644 index 7abb7e8cb5c1..000000000000 --- a/net-p2p/knapster2/files/digest-knapster2-0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 33ab10e3236ed6c2bef662e9da378676 knapster2-0.4.tar.gz 707250 diff --git a/net-p2p/knapster2/files/digest-knapster2-0.5 b/net-p2p/knapster2/files/digest-knapster2-0.5 index c31404f795fe..7714d1015d21 100644 --- a/net-p2p/knapster2/files/digest-knapster2-0.5 +++ b/net-p2p/knapster2/files/digest-knapster2-0.5 @@ -1 +1,3 @@ MD5 f59f04abf0b4aa0f599e8cdf7fba53f3 knapster2-0.5.tar.gz 721990 +RMD160 47697ab4b9b8d6b25f6b4296bcba704df5ce1736 knapster2-0.5.tar.gz 721990 +SHA256 44aa6051f32bfcef55bf4b38e5e7025042c40cd5895827ab38e65e7b6fccb8c7 knapster2-0.5.tar.gz 721990 diff --git a/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff b/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff deleted file mode 100644 index e38596f986cb..000000000000 --- a/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff +++ /dev/null @@ -1,524 +0,0 @@ -diff -EbBcr knapster2-0.4/knapster2/incomingconnection.cpp knapster2-0.4s/knapster2/incomingconnection.cpp -*** knapster2-0.4/knapster2/incomingconnection.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/incomingconnection.cpp 2002-10-08 00:36:13.000000000 +0200 -*************** -*** 4,9 **** ---- 4,10 ---- - */ - #include "incomingconnection.h" - #include -+ using namespace std; - #include "support_funcs.h" - - #include -diff -EbBcr knapster2-0.4/knapster2/knap_adduserdlg.cpp knapster2-0.4s/knapster2/knap_adduserdlg.cpp -*** knapster2-0.4/knapster2/knap_adduserdlg.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_adduserdlg.cpp 2002-10-08 00:35:34.000000000 +0200 -*************** -*** 18,23 **** ---- 18,24 ---- - //#include - - #include -+ using namespace std; - /* - * Constructs a KNAP_AddUserDlg which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' -diff -EbBcr knapster2-0.4/knapster2/knap_chanlist.cpp knapster2-0.4s/knapster2/knap_chanlist.cpp -*** knapster2-0.4/knapster2/knap_chanlist.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_chanlist.cpp 2002-10-08 00:34:41.000000000 +0200 -*************** -*** 17,22 **** ---- 17,23 ---- - #include "support_funcs.h" - - #include -+ using namespace std; - /* - * Constructs a KNAP_Channellist which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' -diff -EbBcr knapster2-0.4/knapster2/knap_chanpanel.cpp knapster2-0.4s/knapster2/knap_chanpanel.cpp -*** knapster2-0.4/knapster2/knap_chanpanel.cpp 2002-04-14 05:22:33.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_chanpanel.cpp 2002-10-08 00:33:40.000000000 +0200 -*************** -*** 32,37 **** ---- 32,38 ---- - #include "speedbad.xpm" - - #include -+ using namespace std; - - KNAP_ChanPanel::KNAP_ChanPanel(QWidget *parent,const char *name) - : QFrame(parent,name) -diff -EbBcr knapster2-0.4/knapster2/knap_connectdlg.cpp knapster2-0.4s/knapster2/knap_connectdlg.cpp -*** knapster2-0.4/knapster2/knap_connectdlg.cpp 2002-04-14 03:26:42.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_connectdlg.cpp 2002-10-08 00:32:40.000000000 +0200 -*************** -*** 17,22 **** ---- 17,23 ---- - #include "knap_preferences.h" - - #include -+ using namespace std; - - /* - * Constructs a KNAP_ConnectDlg which is a child of 'parent', with the -diff -EbBcr knapster2-0.4/knapster2/knap_homepanel.cpp knapster2-0.4s/knapster2/knap_homepanel.cpp -*** knapster2-0.4/knapster2/knap_homepanel.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_homepanel.cpp 2002-10-08 00:31:51.000000000 +0200 -*************** -*** 4,13 **** - #include - - #include - - //#include "welcome-html.h" - -! KNAP_HomePanel::KNAP_HomePanel(QWidget *parent,const char *name=0) - : QWidget(parent,name) - { - ---- 4,14 ---- - #include - - #include -+ using namespace std; - - //#include "welcome-html.h" - -! KNAP_HomePanel::KNAP_HomePanel(QWidget *parent,const char *name) - : QWidget(parent,name) - { - -diff -EbBcr knapster2-0.4/knapster2/knap_hotlistpanel.cpp knapster2-0.4s/knapster2/knap_hotlistpanel.cpp -*** knapster2-0.4/knapster2/knap_hotlistpanel.cpp 2002-04-14 03:36:59.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_hotlistpanel.cpp 2002-10-08 00:29:30.000000000 +0200 -*************** -*** 19,24 **** ---- 19,25 ---- - #include "songinfo.h" - - #include -+ using namespace std; - #include - #include - #include -*************** -*** 362,368 **** - - if(user == song->user) - { -! QString s_time = QString().setNum(floor(song->seconds / 60)); - cerr << "KNAP_HotlistPanel::addSong(): time is " << song->seconds << endl; - s_time += ":"; - int sec = song->seconds % 60; ---- 363,369 ---- - - if(user == song->user) - { -! QString s_time = QString().setNum((int)floor((double)(song->seconds / 60))); - cerr << "KNAP_HotlistPanel::addSong(): time is " << song->seconds << endl; - s_time += ":"; - int sec = song->seconds % 60; -diff -EbBcr knapster2-0.4/knapster2/knap_librarypanel.cpp knapster2-0.4s/knapster2/knap_librarypanel.cpp -*** knapster2-0.4/knapster2/knap_librarypanel.cpp 2002-04-13 12:13:51.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_librarypanel.cpp 2002-10-08 00:26:13.000000000 +0200 -*************** -*** 35,41 **** - - #include "songinfo.h" - -! #include - - #include - #include ---- 35,42 ---- - - #include "songinfo.h" - -! #include -! using namespace std; - - #include - #include -*************** -*** 236,242 **** - // put the item in the listview - // field 6 is invisible & holds the FULL path name of the song - -! QString s_time = QString().setNum(floor(seconds / 60)); - s_time += ":"; - int sec = seconds % 60; - if (sec < 10) s_time += "0"; ---- 237,243 ---- - // put the item in the listview - // field 6 is invisible & holds the FULL path name of the song - -! QString s_time = QString().setNum((int)floor((double)(seconds / 60))); - s_time += ":"; - int sec = seconds % 60; - if (sec < 10) s_time += "0"; -diff -EbBcr knapster2-0.4/knapster2/knap_listview.cpp knapster2-0.4s/knapster2/knap_listview.cpp -*** knapster2-0.4/knapster2/knap_listview.cpp 2002-04-13 12:14:19.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_listview.cpp 2002-10-08 00:06:06.000000000 +0200 -*************** -*** 27,33 **** - #include - #include - -! #include - //#include - - static int stricmp(const char *s1, const char *s2) ---- 27,33 ---- - #include - #include - -! #include - //#include - - static int stricmp(const char *s1, const char *s2) -diff -EbBcr knapster2-0.4/knapster2/knap_player.cpp knapster2-0.4s/knapster2/knap_player.cpp -*** knapster2-0.4/knapster2/knap_player.cpp 2002-04-14 05:51:34.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_player.cpp 2002-10-08 00:22:09.000000000 +0200 -*************** -*** 3,8 **** ---- 3,10 ---- - #include - #include - #include -+ #include -+ using namespace std; - - #include "knap_player.h" - #include -diff -EbBcr knapster2-0.4/knapster2/knap_playlist.cpp knapster2-0.4s/knapster2/knap_playlist.cpp -*** knapster2-0.4/knapster2/knap_playlist.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_playlist.cpp 2002-10-08 00:19:24.000000000 +0200 -*************** -*** 13,18 **** ---- 13,19 ---- - #include - - #include -+ using namespace std; - - #include "support_funcs.h" - -diff -EbBcr knapster2-0.4/knapster2/knap_preferencesdlg.cpp knapster2-0.4s/knapster2/knap_preferencesdlg.cpp -*** knapster2-0.4/knapster2/knap_preferencesdlg.cpp 2002-04-13 11:29:43.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_preferencesdlg.cpp 2002-10-08 00:18:19.000000000 +0200 -*************** -*** 36,41 **** ---- 36,42 ---- - #include - - #include -+ using namespace std; - - static const char* const image0_data[] = { - "48 48 30 1", -diff -EbBcr knapster2-0.4/knapster2/knap_searchpanel.cpp knapster2-0.4s/knapster2/knap_searchpanel.cpp -*** knapster2-0.4/knapster2/knap_searchpanel.cpp 2002-04-13 11:39:41.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_searchpanel.cpp 2002-10-08 00:16:54.000000000 +0200 -*************** -*** 36,42 **** - #include "songinfo.h" - #include "support_funcs.h" - -! #include - #include - #include - #include ---- 36,43 ---- - #include "songinfo.h" - #include "support_funcs.h" - -! #include -! using namespace std; - #include - #include - #include -*************** -*** 421,427 **** - char buf[10]; - sprintf(buf,"%05d",song->speed); - -! QString s_time = QString().setNum(floor(song->seconds / 60)); - s_time += ":"; - int sec = song->seconds % 60; - if (sec < 10) s_time += "0"; ---- 422,428 ---- - char buf[10]; - sprintf(buf,"%05d",song->speed); - -! QString s_time = QString().setNum((int)floor((long double)(song->seconds / 60))); - s_time += ":"; - int sec = song->seconds % 60; - if (sec < 10) s_time += "0"; -diff -EbBcr knapster2-0.4/knapster2/knapster2.cpp knapster2-0.4s/knapster2/knapster2.cpp -*** knapster2-0.4/knapster2/knapster2.cpp 2002-05-19 06:12:13.000000000 +0200 ---- knapster2-0.4s/knapster2/knapster2.cpp 2002-10-08 00:08:03.000000000 +0200 -*************** -*** 1,4 **** ---- 1,5 ---- - #include -+ using namespace std; - #include // for sscanf - - #include -diff -EbBcr knapster2-0.4/knapster2/knap_transferpanel.cpp knapster2-0.4s/knapster2/knap_transferpanel.cpp -*** knapster2-0.4/knapster2/knap_transferpanel.cpp 2002-05-19 06:21:50.000000000 +0200 ---- knapster2-0.4s/knapster2/knap_transferpanel.cpp 2002-10-08 00:12:58.000000000 +0200 -*************** -*** 44,50 **** - - #include - -! #include - - #include - #include ---- 44,51 ---- - - #include - -! #include -! using namespace std; - - #include - #include -*************** -*** 84,91 **** - ret=""; // i18n("Unknown"); - return ret; - } -! int hours = (int)floor(timeleft / 3600); -! int minutes = (int)floor((timeleft % 3600) / 60); - int seconds = timeleft % 60; - ret = QString().setNum(hours).rightJustify(2, '0') + ":" + - QString().setNum(minutes).rightJustify(2, '0') + ":" + ---- 85,92 ---- - ret=""; // i18n("Unknown"); - return ret; - } -! int hours = (int)floor((long double)(timeleft / 3600)); -! int minutes = (int)floor((long double)((timeleft % 3600) / 60)); - int seconds = timeleft % 60; - ret = QString().setNum(hours).rightJustify(2, '0') + ":" + - QString().setNum(minutes).rightJustify(2, '0') + ":" + -diff -EbBcr knapster2-0.4/knapster2/napsterconnection.cpp knapster2-0.4s/knapster2/napsterconnection.cpp -*** knapster2-0.4/knapster2/napsterconnection.cpp 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/napsterconnection.cpp 2002-10-08 00:48:01.000000000 +0200 -*************** -*** 24,29 **** ---- 24,30 ---- - /* - #include - */ -+ #include - #include - - #include -*************** -*** 41,47 **** - - #include - -! #include - - #include "songinfo.h" - // for doing looping inbetween parts set this 0- not that it makes much difference ---- 42,53 ---- - - #include - -! #include -! using namespace std; -! //namespace std { -! // extern int connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen); -! // int close(int fd); -! //} // namespace std - - #include "songinfo.h" - // for doing looping inbetween parts set this 0- not that it makes much difference -*************** -*** 178,187 **** - // kapp->processEvents(1000); - #endif - -! if(std::connect(_napstersock,(sockaddr - *)&_sockaddr,sizeof(struct sockaddr))<0) - { -! std::close(_napstersock); - _napstersock=-1; - cerr<<"NapsterConnection::open(): Can't connect!\n"<processEvents(1000); - #endif - -! if(::connect(_napstersock,(sockaddr - *)&_sockaddr,sizeof(struct sockaddr))<0) - { -! ::close(_napstersock); - _napstersock=-1; - cerr<<"NapsterConnection::open(): Can't connect!\n"<getSocket()); - - incominglist.removeRef(i); - } ---- 404,410 ---- - } - // kill from list - else -! ::close(i->getSocket()); - - incominglist.removeRef(i); - } -*************** -*** 918,924 **** - #ifdef DEBUG_1 - cerr<< "bind error in connection listener\n"< - //#include - - #include // FIXME ---- 22,28 ---- - *@author jade - */ - -! #include - //#include - - #include // FIXME -diff -EbBcr knapster2-0.4/knapster2/napsterdownload1.cpp knapster2-0.4s/knapster2/napsterdownload1.cpp -*** knapster2-0.4/knapster2/napsterdownload1.cpp 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/napsterdownload1.cpp 2002-10-08 00:04:46.000000000 +0200 -*************** -*** 36,42 **** - - #include - #include -! #include - - #include - ---- 36,43 ---- - - #include - #include -! #include -! using namespace std; - - #include - -diff -EbBcr knapster2-0.4/knapster2/napsterdownload1.h knapster2-0.4s/knapster2/napsterdownload1.h -*** knapster2-0.4/knapster2/napsterdownload1.h 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/napsterdownload1.h 2002-10-07 23:11:24.000000000 +0200 -*************** -*** 36,42 **** - { - // friend NapsterConnection; - // friend Knapster2; -! friend KNAP_TransferPanel; - // char _buffer[2048]; - - int _sock; ---- 36,42 ---- - { - // friend NapsterConnection; - // friend Knapster2; -! friend class KNAP_TransferPanel; - // char _buffer[2048]; - - int _sock; -diff -EbBcr knapster2-0.4/knapster2/napsterupload.cpp knapster2-0.4s/knapster2/napsterupload.cpp -*** knapster2-0.4/knapster2/napsterupload.cpp 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/napsterupload.cpp 2002-10-08 00:04:55.000000000 +0200 -*************** -*** 39,45 **** - - #include - -! #include - - #include "support_funcs.h" - ---- 39,46 ---- - - #include - -! #include -! using namespace std; - - #include "support_funcs.h" - -diff -EbBcr knapster2-0.4/knapster2/napsterupload.h knapster2-0.4s/knapster2/napsterupload.h -*** knapster2-0.4/knapster2/napsterupload.h 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/napsterupload.h 2002-10-07 23:10:43.000000000 +0200 -*************** -*** 28,34 **** - - class NapsterUpload : public NapsterTransfer - { -! friend KNAP_TransferPanel; - - char _buffer[1024+2]; - ---- 28,34 ---- - - class NapsterUpload : public NapsterTransfer - { -! friend class KNAP_TransferPanel; - - char _buffer[1024+2]; - -diff -EbBcr knapster2-0.4/knapster2/songinfo.cpp knapster2-0.4s/knapster2/songinfo.cpp -*** knapster2-0.4/knapster2/songinfo.cpp 2002-04-13 11:29:44.000000000 +0200 ---- knapster2-0.4s/knapster2/songinfo.cpp 2002-10-07 23:14:31.000000000 +0200 -*************** -*** 19,25 **** - - #include "md5.h" - -! #include - - #include - #include ---- 19,25 ---- - - #include "md5.h" - -! #include - - #include - #include - diff --git a/net-p2p/knapster2/knapster2-0.4.ebuild b/net-p2p/knapster2/knapster2-0.4.ebuild deleted file mode 100644 index 845198beb703..000000000000 --- a/net-p2p/knapster2/knapster2-0.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/knapster2/knapster2-0.4.ebuild,v 1.13 2004/08/14 14:52:13 swegener Exp $ - -inherit kde - -DESCRIPTION="Napster Client for Linux" -SRC_URI="mirror://sourceforge/knapster/${P}.tar.gz" -HOMEPAGE="http://knapster.sourceforge.net" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc" -IUSE="" - -need-kde 3 - -src_unpack() { - cd ${WORKDIR} - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${P}-gcc3.2.diff || die -} -- 2.26.2