diff options
author | Caleb Tennis <caleb@gentoo.org> | 2003-06-22 18:24:00 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2003-06-22 18:24:00 +0000 |
commit | 1e93059be8a3cbfc254645f9ad95b548bdce6ed0 (patch) | |
tree | a0d2d3a1f357824a446076a845689e9ea3398d61 /kde-base | |
parent | update to icewm (diff) | |
download | historical-1e93059be8a3cbfc254645f9ad95b548bdce6ed0.tar.gz historical-1e93059be8a3cbfc254645f9ad95b548bdce6ed0.tar.bz2 historical-1e93059be8a3cbfc254645f9ad95b548bdce6ed0.zip |
Removing stale ebuilds
Diffstat (limited to 'kde-base')
25 files changed, 12 insertions, 1015 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 6ae77324ed23..c0aa94479f97 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.80 2003/06/19 14:32:31 wwoods Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.81 2003/06/22 18:23:44 caleb Exp $ + + 21 Jun 2003; Caleb Tennis <caleb@gentoo.org>: + Removed old ebuilds: 2.2.2a-r1, 3.0.5a-r1, 3.1, 3.1-r2, 3.1-r3, 3.1.1, 3.1.1-r1 + and assorted patch/diff files that go along with them. 16 Jun 2003; Will Woods <wwoods@gentoo.org> kdelibs-3.1.2.ebuild: Marked stable for alpha diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index a7416b6fb432..cc981bdbe9cd 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,39 +1,16 @@ -MD5 239f9bc72d3bdcc137104dd699e56dad ChangeLog 13889 -MD5 473d5b5fc8173adfcfca96940e58f7d7 kdelibs-2.2.2a-r1.ebuild 2414 +MD5 ce8f609e9da93b271d518f8dc9dde2eb kdelibs-3.1.2.ebuild 2436 MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303 -MD5 5f74c0821a73f0c8f26843e4af713d1c kdelibs-3.0.5a-r1.ebuild 2062 -MD5 1acc34614d989d737b8963e4018d6791 kdelibs-3.1-r2.ebuild 2919 -MD5 8f10a0f9fe61e3f3df2303d1299b380b kdelibs-3.1.ebuild 2253 -MD5 95587d5222406da38c6a01a5a213cfd9 kdelibs-3.1-r3.ebuild 2679 -MD5 fc0c30efb45729dff9fa19ebbe233c2e kdelibs-3.1.1.ebuild 2478 -MD5 16dee449bf6e127b765f31d12686e4a8 kdelibs-3.1.1-r1.ebuild 2605 -MD5 a155e553dc36b2e5a7e7e85e72a14374 kdelibs-2.2.2a-r2.ebuild 2567 -MD5 28d5d6943fcb69c88c602bc72f175665 kdelibs-3.0.5b.ebuild 1922 MD5 cc47efcd70a7e332a245ebb59833142d kdelibs-3.1.1a.ebuild 2645 -MD5 ce8f609e9da93b271d518f8dc9dde2eb kdelibs-3.1.2.ebuild 2436 -MD5 f458fafcd88e2ea5c4eb8a88424640c4 files/digest-kdelibs-2.2.2a-r1 67 -MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142 -MD5 a24c4fa284fa06452ffd4ea438270fd2 files/digest-kdelibs-3.0.5a-r1 68 -MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1 66 -MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r2 66 +MD5 28d5d6943fcb69c88c602bc72f175665 kdelibs-3.0.5b.ebuild 1922 +MD5 a155e553dc36b2e5a7e7e85e72a14374 kdelibs-2.2.2a-r2.ebuild 2567 +MD5 6ca2d972ee72d43b9b5bff91611effeb ChangeLog 14078 MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267 -MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788 -MD5 bcd0e223c0be9cc4d1af5f2b5578a096 files/kdelibs-3.0.5a-dontcrash.diff 500 -MD5 b9e995da45022f78aed48a79f02201e7 files/kdelibs-3.1-bookmark.diff 1320 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 6e7c2097ad93ecd9a011d1685cb8971f files/kdelibs-3.1-libxml2-2.5.2.diff 1404 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1-zip.diff 2906 -MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r3 66 -MD5 185c0cca81183c5659b62f91fd240771 files/digest-kdelibs-3.1.1 68 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1.1-zip.diff 2906 -MD5 321a6376eccdfa7077aea0e578b560b5 files/digest-kdelibs-3.1.1-r1 1114 -MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5a-libxml2-2.5.2.diff 703 -MD5 3c178889822836378fcf526195b86814 files/kdelibs-3.1.1-kio_http.diff 5257 -MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139 MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b 68 MD5 fe5064a43dd8ed966e50aee8b8f3364a files/digest-kdelibs-3.1.1a 136 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477 MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2 68 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477 +MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142 +MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788 +MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139 diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 deleted file mode 100644 index 46a8292384fa..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 51ec17dce9c62b50a3c2e97e4511cdcf kdelibs-2.2.2.tar.bz2 5955592 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 deleted file mode 100644 index d05d48bfa85c..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a3c714c7727ddc70e7c9ea6acf5e42dc kdelibs-3.0.5a.tar.bz2 7647507 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1 b/kde-base/kdelibs/files/digest-kdelibs-3.1 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 b/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.1 deleted file mode 100644 index bc63cdc312e6..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 15eb9412c589126844b277b9e80cfffc kdelibs-3.1.1.tar.bz2 10313173 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 deleted file mode 100644 index a8ef657d80ea..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 +++ /dev/null @@ -1,14 +0,0 @@ -MD5 3c178889822836378fcf526195b86814 /files/kdelibs-3.1.1-kio_http.diff 5257 -MD5 24190dc0508cd29ea5adecc4cefc0db2 /files/kdelibs-2.2.2a-crosside.diff 1267 -MD5 b9e995da45022f78aed48a79f02201e7 /files/kdelibs-3.1-bookmark.diff 1320 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 /files/kdelibs-3.1.1-zip.diff 2906 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 /files/kdelibs-3.1-zip.diff 2906 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 bcd0e223c0be9cc4d1af5f2b5578a096 /files/kdelibs-3.0.5a-dontcrash.diff 500 -MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 /files/kdelibs-2.2.2a-gentoo.diff 75788 -MD5 6e7c2097ad93ecd9a011d1685cb8971f /files/kdelibs-3.1-libxml2-2.5.2.diff 1404 -MD5 acd90863c0847e230aa37f3943d58176 /files/kdelibs-3.0.5a-libxml2-2.5.2.diff 703 -MD5 6d7ef21b5c69861561d1d3a418a4f931 /kdelibs-3.1.1-r1.ebuild 2583 -MD5 15eb9412c589126844b277b9e80cfffc kdelibs-3.1.1.tar.bz2 10313173 diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff b/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff deleted file mode 100644 index 5fb8463d545e..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff +++ /dev/null @@ -1,14 +0,0 @@ -RCS file: /home/kde/kdelibs/khtml/rendering/render_replaced.cpp,v -retrieving revision 1.92.2.5 -retrieving revision 1.92.2.6 -diff -b -p -u -r1.92.2.5 -r1.92.2.6 ---- khtml/rendering/render_replaced.cpp 1 Oct 2002 19:22:51 -0000 1.92.2.5 -+++ khtml/rendering/render_replaced.cpp 4 Jan 2003 23:42:31 -0000 1.92.2.6 -@@ -153,7 +153,6 @@ void RenderWidget::detach() - RenderWidget::~RenderWidget() - { - KHTMLAssert( refCount() <= 0 ); -- assert(!m_view); - - if(m_widget) { - m_widget->hide(); diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff deleted file mode 100644 index 19c0ef9c9aab..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kdoctools/customization/entities/general.entities~ 2003-03-14 23:11:41.000000000 +0100 -+++ kdoctools/customization/entities/general.entities 2003-03-14 23:12:24.000000000 +0100 -@@ -353,7 +353,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> diff --git a/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff b/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff deleted file mode 100644 index 84a730bef1c1..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- kio/bookmarks/kbookmarkmenu.cc~ 2003-02-03 16:41:06.000000000 +0100 -+++ kio/bookmarks/kbookmarkmenu.cc 2003-02-03 16:44:46.000000000 +0100 -@@ -269,10 +269,10 @@ - else - { - // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; -- // create a normal URL item, with ID as a name -+ // create a normal URL item, with address as a name - KAction * action = new KAction( text, bm.icon(), 0, - this, SLOT( slotBookmarkSelected() ), -- m_actionCollection, bm.url().url().utf8() ); -+ m_actionCollection, bm.address().utf8() ); - - action->setStatusText( bm.url().prettyURL() ); - -@@ -369,8 +369,11 @@ - if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - //kdDebug(1203) << sender()->name() << endl; - -- // The name of the action is the URL to open -- m_pOwner->openBookmarkURL( QString::fromUtf8(sender()->name()) ); -+ KBookmark bookmark = m_pManager->findByAddress( QString::fromUtf8(sender()->name()) ); -+ Q_ASSERT(!bookmark.isNull()); -+ Q_ASSERT(!bookmark.isGroup()); -+ -+ m_pOwner->openBookmarkURL( bookmark.url().url() ); - } - - // ----------------------------------------------------------------------------- diff --git a/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch deleted file mode 100644 index 930776d23a51..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kjs/ustring.cpp.orig 2003-01-23 15:49:49.000000000 -0500 -+++ kjs/ustring.cpp 2003-01-27 19:49:00.000000000 -0500 -@@ -421,8 +421,15 @@ - { - double d = toDouble(); - bool b = true; -+ /* useless temporary variable to work around gcc optimization bug */ -+ bool nan = false; - -- if (isNaN(d) || d != static_cast<unsigned long>(d)) { -+ if (isNaN(d)) { -+ d = 0; -+ nan = true; -+ } -+ -+ if (nan || d != static_cast<unsigned long>(d)) { - b = false; - d = 0; - } diff --git a/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff deleted file mode 100644 index a859d81227ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- kdoctools/customization/entities/general.entities 2002-10-28 14:38:14.000000000 -0500 -+++ kdoctools/customization/entities/general.entities 2003-02-12 14:05:19.000000000 -0500 -@@ -351,7 +351,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> ---- kdoctools/customization/obsolete/general.entities 2002-04-16 11:57:18.000000000 -0400 -+++ kdoctools/customization/obsolete/general.entities 2003-02-12 14:04:53.000000000 -0500 -@@ -354,7 +354,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> diff --git a/kde-base/kdelibs/files/kdelibs-3.1-zip.diff b/kde-base/kdelibs/files/kdelibs-3.1-zip.diff deleted file mode 100644 index e63c14fd79ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-zip.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -u -r kio/kio/kzip.cpp kio/kio/kzip.cpp ---- kio/kio/kzip.cpp 2003-01-03 02:58:47.000000000 -0200 -+++ kio/kio/kzip.cpp 2003-01-29 22:16:15.000000000 -0200 -@@ -332,27 +332,43 @@ - - KArchiveEntry* entry; - if ( isdir ) -- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ { -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ KArchiveEntry* ent = rootDir()->entry( path ); -+ if ( ent && ent->isDirectory() ) -+ { -+ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl; -+ entry = 0L; -+ } -+ else -+ { -+ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl; -+ } -+ } - else - { - entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null, -- name, dataoffset, ucsize, cmethod, csize ); -+ name, dataoffset, ucsize, cmethod, csize ); - static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset ); -- //kdDebug(7040) << "KZipFileEntry created" << endl; -+ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl; - d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) ); - } - -- if ( pos == -1 ) -- { -- rootDir()->addEntry(entry); -- } -- else -- { -- // In some tar files we can find dir/./file => call cleanDirPath -- QString path = QDir::cleanDirPath( name.left( pos ) ); -- // Ensure container directory exists, create otherwise -- KArchiveDirectory * tdir = findOrCreate( path ); -- tdir->addEntry(entry); -+ if ( entry ) -+ { -+ if ( pos == -1 ) -+ { -+ rootDir()->addEntry(entry); -+ } -+ else -+ { -+ // In some tar files we can find dir/./file => call cleanDirPath -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ // Ensure container directory exists, create otherwise -+ KArchiveDirectory * tdir = findOrCreate( path ); -+ tdir->addEntry(entry); -+ } - } - - //calculate offset to next entry diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff b/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff deleted file mode 100644 index dc8beb0ddca9..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff +++ /dev/null @@ -1,160 +0,0 @@ -cvs -f log -N -r1.551.2.9 http.cc - -RCS file: /home/kde/kdelibs/kioslave/http/http.cc,v -Working file: http.cc -head: 1.565 -branch: -locks: strict -access list: -keyword substitution: kv -total revisions: 632; selected revisions: 1 -description: ----------------------------- -revision 1.551.2.9 -date: 2003/03/17 14:20:31; author: waba; state: Exp; lines: +112 -112 -CCMAIL: 55571-done@bugs.kde.org -Fix Bug 55571: https authentication through proxy fails - -(This patch basically reverts r1.546 and r1.544) -m_bNeedTunnel was incorrectly used to check whether we were busy connecting -to a proxy or sending the actual request. Moved some code around so that it -only gets executed when sending the actual request so that it isn't necassery -any more to abuse m_bNeedTunnel for this. - -The resetting of m_bNeedTunnel caused bug 55571, it isn't necassery to reset -it, the resetting was a poor attempt to let m_bNeedTunnel serve as a status -indicator for something it wasn't intended to indicate. -============================================================================= -cvs -f diff -kk -bp -u -r1.551.2.8 -r1.551.2.9 http.cc -Index: http.cc -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/http.cc,v -retrieving revision 1.551.2.8 -retrieving revision 1.551.2.9 -diff -b -p -u -r1.551.2.8 -r1.551.2.9 ---- kioslave/http/http.cc 14 Feb 2003 19:50:53 -0000 1.551.2.8 -+++ kioslave/http/http.cc 17 Mar 2003 14:20:31 -0000 1.551.2.9 -@@ -438,7 +438,6 @@ bool HTTPProtocol::retrieveHeader( bool - kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl; - setEnableSSLTunnel( false ); - m_bIsTunneled = true; -- m_bNeedTunnel = false; - // Reset the CONNECT response code... - m_responseCode = m_prevResponseCode; - continue; -@@ -1936,7 +1935,42 @@ bool HTTPProtocol::httpOpen() - // Check the validity of the current connection, if one exists. - httpCheckConnection(); - -- // Determine if this is a POST or GET method -+ -+ if ( !m_bIsTunneled && m_bNeedTunnel ) -+ { -+ setEnableSSLTunnel( true ); -+ // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -+ // need any HTTP 1.1 capabilities for CONNECT - Waba -+ header = QString("CONNECT %1:%2 HTTP/1.0" -+ "\r\n").arg( m_request.hostname).arg(m_request.port); -+ -+ // Identify who you are to the proxy server! -+ if (!m_request.userAgent.isEmpty()) -+ header += "User-Agent: " + m_request.userAgent + "\r\n"; -+ -+ /* Add hostname information */ -+ header += "Host: "; -+ if (m_state.hostname.find(':') != -1) -+ { -+ // This is an IPv6 (not hostname) -+ header += '['; -+ header += m_state.hostname; -+ header += ']'; -+ } -+ else -+ { -+ header += m_state.hostname; -+ } -+ -+ if (m_state.port != m_iDefaultPort) -+ header += QString(":%1").arg(m_state.port); -+ header += "\r\n"; -+ -+ header += proxyAuthenticationHeader(); -+ } -+ else -+ { -+ // Determine the kind of method we are handling... - switch (m_request.method) - { - case HTTP_GET: -@@ -1944,12 +1978,12 @@ bool HTTPProtocol::httpOpen() - break; - case HTTP_PUT: - header = "PUT "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_POST: - header = "POST "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_HEAD: -@@ -2033,40 +2067,6 @@ bool HTTPProtocol::httpOpen() - return false; - } - -- if ( !m_bIsTunneled && m_bNeedTunnel ) -- { -- setEnableSSLTunnel( true ); -- // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -- // need any HTTP 1.1 capabilities for CONNECT - Waba -- header = QString("CONNECT %1:%2 HTTP/1.0" -- "\r\n").arg( m_request.hostname).arg(m_request.port); -- -- // Identify who you are to the proxy server! -- if (!m_request.userAgent.isEmpty()) -- header += "User-Agent: " + m_request.userAgent + "\r\n"; -- -- /* Add hostname information */ -- header += "Host: "; -- if (m_state.hostname.find(':') != -1) -- { -- // This is an IPv6 (not hostname) -- header += '['; -- header += m_state.hostname; -- header += ']'; -- } -- else -- { -- header += m_state.hostname; -- } -- -- if (m_state.port != m_iDefaultPort) -- header += QString(":%1").arg(m_state.port); -- header += "\r\n"; -- -- header += proxyAuthenticationHeader(); -- } -- else -- { - // format the URI - if (m_state.doProxy && !m_bIsTunneled) - { -@@ -2271,7 +2271,6 @@ bool HTTPProtocol::httpOpen() - // Do we need to authorize to the proxy server ? - if ( m_state.doProxy && !m_bIsTunneled ) - header += proxyAuthenticationHeader(); -- } - - if ( m_protocol == "webdav" || m_protocol == "webdavs" ) - { -@@ -2289,6 +2288,7 @@ bool HTTPProtocol::httpOpen() - // add extra header elements for WebDAV - if ( !davHeader.isNull() ) - header += davHeader; -+ } - } - - kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl; diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch deleted file mode 100644 index 930776d23a51..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kjs/ustring.cpp.orig 2003-01-23 15:49:49.000000000 -0500 -+++ kjs/ustring.cpp 2003-01-27 19:49:00.000000000 -0500 -@@ -421,8 +421,15 @@ - { - double d = toDouble(); - bool b = true; -+ /* useless temporary variable to work around gcc optimization bug */ -+ bool nan = false; - -- if (isNaN(d) || d != static_cast<unsigned long>(d)) { -+ if (isNaN(d)) { -+ d = 0; -+ nan = true; -+ } -+ -+ if (nan || d != static_cast<unsigned long>(d)) { - b = false; - d = 0; - } diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff b/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff deleted file mode 100644 index e63c14fd79ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -u -r kio/kio/kzip.cpp kio/kio/kzip.cpp ---- kio/kio/kzip.cpp 2003-01-03 02:58:47.000000000 -0200 -+++ kio/kio/kzip.cpp 2003-01-29 22:16:15.000000000 -0200 -@@ -332,27 +332,43 @@ - - KArchiveEntry* entry; - if ( isdir ) -- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ { -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ KArchiveEntry* ent = rootDir()->entry( path ); -+ if ( ent && ent->isDirectory() ) -+ { -+ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl; -+ entry = 0L; -+ } -+ else -+ { -+ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl; -+ } -+ } - else - { - entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null, -- name, dataoffset, ucsize, cmethod, csize ); -+ name, dataoffset, ucsize, cmethod, csize ); - static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset ); -- //kdDebug(7040) << "KZipFileEntry created" << endl; -+ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl; - d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) ); - } - -- if ( pos == -1 ) -- { -- rootDir()->addEntry(entry); -- } -- else -- { -- // In some tar files we can find dir/./file => call cleanDirPath -- QString path = QDir::cleanDirPath( name.left( pos ) ); -- // Ensure container directory exists, create otherwise -- KArchiveDirectory * tdir = findOrCreate( path ); -- tdir->addEntry(entry); -+ if ( entry ) -+ { -+ if ( pos == -1 ) -+ { -+ rootDir()->addEntry(entry); -+ } -+ else -+ { -+ // In some tar files we can find dir/./file => call cleanDirPath -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ // Ensure container directory exists, create otherwise -+ KArchiveDirectory * tdir = findOrCreate( path ); -+ tdir->addEntry(entry); -+ } - } - - //calculate offset to next entry diff --git a/kde-base/kdelibs/kdelibs-2.2.2a-r1.ebuild b/kde-base/kdelibs/kdelibs-2.2.2a-r1.ebuild deleted file mode 100644 index af20c239c9ca..000000000000 --- a/kde-base/kdelibs/kdelibs-2.2.2a-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2a-r1.ebuild,v 1.8 2003/04/27 13:43:49 danarmak Exp $ -inherit kde -#don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps! - -IUSE="ssl cups ipv6 alsa" -DESCRIPTION="KDE $PV - base libraries needed by all kde programs" -KEYWORDS="x86 sparc " -HOMEPAGE="http//www.kde.org/" -SRC_URI="mirror://kde/2.2.2/src/${PN}-${PV/a/}.tar.bz2" - -SLOT="2" -LICENSE="GPL-2 LGPL-2" - -S=$WORKDIR/kdelibs-2.2.2 - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire -# DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend ">=sys-devel/gcc-2.95.2 - virtual/glibc - dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( net-print/cups ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss" - -DEPEND="$DEPEND - sys-devel/make - sys-devel/autoconf - sys-devel/automake" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python" - -qtver-from-kdever $PV -need-qt $selected_version - -set-kdedir $PV - -#this patch contains security issues backported from kde-3.0.5a. -PATCHES="${FILESDIR}/${P}-gentoo.diff - ${FILESDIR}/${P}-crosside.diff" - -#fix 11732 and friends -MAKEOPTS="$MAKEOPTS -j1" - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/{arts/soundserver,kio/kpac} -} - -src_compile() { - kde_src_compile myconf - - use ipv6 || myconf="$myconf --with-ipv6-lookup=no" - use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" - use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" - use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - - kde_src_compile configure make -} - -src_install() { - kde_src_install - dohtml *.html - - dodir /etc/env.d - if [ "${PREFIX}" != "/usr/kde/2" ]; then -echo "PATH=${PREFIX}/bin:/usr/kde/2/bin -ROOTPATH=${PREFIX}/bin:/usr/kde/2/bin -LDPATH=${PREFIX}/lib:/usr/kde/2/lib" > ${D}/etc/env.d/70kdelibs-${PV} - else -echo "PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/bin -LDPATH=${PREFIX}/lib" > ${D}/etc/env.d/70kdelibs-${PV} - fi - - echo "KDEDIR=/usr/kde/2" > ${D}/etc/env.d/40kdedir-${PV} -} diff --git a/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild deleted file mode 100644 index 35b98b404c6c..000000000000 --- a/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild,v 1.11 2003/04/27 13:43:49 danarmak Exp $ -inherit kde eutils -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE $PV - base libraries needed by all kde programs" -KEYWORDS="x86 ~ppc ~alpha sparc" -HOMEPAGE="http//www.kde.org/" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" -SLOT="3.0" -LICENSE="GPL-2 LGPL-2" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire -# DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - ~kde-base/arts-1.0.5a - app-text/ghostscript - sys-devel/gettext" - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for bug #7359 - -myconf="$myconf --with-distribution=Gentoo" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - unpack ${A} - cd ${S} - # fixes crash if kdelibs is compiled with debug and you - # click on "Home" button in konqueror - epatch ${FILESDIR}/${P}-dontcrash.diff - epatch ${FILESDIR}/${P}-libxml2-2.5.2.diff - kde_sandbox_patch ${S}/kio/misc/kpac -} - - -src_install() { - - kde_src_install - dohtml *.html - -} diff --git a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.1-r2.ebuild deleted file mode 100644 index b55cf1c99084..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r2.ebuild,v 1.15 2003/04/27 13:43:49 danarmak Exp $ -inherit kde -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE libraries needed by all kde programs" -KEYWORDS="x86 ppc sparc ~alpha" -HOMEPAGE="http//www.kde.org/" -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" - -PATCHES="${FILESDIR}/${P}-bookmark.diff - ${FILESDIR}/${P}-zip.diff - ${FILESDIR}/${P}-libxml2-2.5.2.diff" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - ~kde-base/arts-1.1.0 - app-text/ghostscript - media-libs/libart_lgpl - sys-devel/gettext" - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for #7359 - -myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -use x86 && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac - use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch -} - -src_install() { - kde_src_install - dohtml *.html - - dodir /etc/env.d -echo "PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${PREFIX}/lib -CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdelibs-${PV} # number goes down with version upgrade - - echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-${PV} # number goes up with version upgrade - - # kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild - # shouldn't install anything into kdelibs-apidocs (bug #15102) - rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs -} - -pkg_postinst() { - -einfo "NOTE: for things to work properly, please upgrade kdebase (if installed) to 3.1-r1 -or greater." -einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1. -If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS= -line and env-update." - -} diff --git a/kde-base/kdelibs/kdelibs-3.1-r3.ebuild b/kde-base/kdelibs/kdelibs-3.1-r3.ebuild deleted file mode 100644 index 70083c3322c2..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1-r3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r3.ebuild,v 1.7 2003/04/27 13:43:49 danarmak Exp $ -inherit kde -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE libraries needed by all kde programs" -KEYWORDS="~x86 ppc ~sparc ~alpha" -HOMEPAGE="http//www.kde.org/" -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" - -PATCHES="${FILESDIR}/${P}-bookmark.diff - ${FILESDIR}/${P}-zip.diff - ${FILESDIR}/${P}-libxml2-2.5.2.diff" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - app-text/ghostscript - media-libs/libart_lgpl - sys-devel/gettext - =kde-base/arts-1.1.0-r1" # this arts rev is part of the same fix - # as kdelibs 3.1-r3 - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for #7359 - -myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -use x86 && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac - use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch -} - -src_install() { - kde_src_install - dohtml *.html - - # kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild - # shouldn't install anything into kdelibs-apidocs (bug #15102) - rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs -} - -pkg_postinst() { - -einfo "NOTE: for things to work properly, please upgrade kdebase (if installed) to 3.1-r1 -or greater." -einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1. -If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS= -line and env-update." - -} diff --git a/kde-base/kdelibs/kdelibs-3.1.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.1.1-r1.ebuild deleted file mode 100644 index 43dae87606b0..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1.1-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.1-r1.ebuild,v 1.7 2003/04/28 05:51:20 pylon Exp $ -inherit kde -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE libraries needed by all kde programs" -KEYWORDS="x86 ppc sparc ~alpha" -HOMEPAGE="http//www.kde.org/" -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" - -PATCHES="${FILESDIR}/${P}-zip.diff" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -DEPEND="" -RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - app-text/ghostscript - media-libs/libart_lgpl - sys-devel/gettext - ~kde-base/arts-1.1.1" # this arts rev is part of the same fix - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for #7359 - -myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -use x86 && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -# patch posted on kde-packager, fixes kde bug #55571 -PATCHES="$FILESDIR/$P-kio_http.diff" - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac - use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch -} - -src_install() { - kde_src_install - dohtml *.html - - # kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild - # shouldn't install anything into kdelibs-apidocs (bug #15102) - rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs -} - -pkg_postinst() { - einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1. - If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS= - line and env-update." -} diff --git a/kde-base/kdelibs/kdelibs-3.1.1.ebuild b/kde-base/kdelibs/kdelibs-3.1.1.ebuild deleted file mode 100644 index 1a0cc61443be..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.1.ebuild,v 1.5 2003/04/27 13:43:49 danarmak Exp $ -inherit kde -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE libraries needed by all kde programs" -KEYWORDS="x86 ~ppc sparc ~alpha" -HOMEPAGE="http//www.kde.org/" -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" - -PATCHES="${FILESDIR}/${P}-zip.diff" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - app-text/ghostscript - media-libs/libart_lgpl - sys-devel/gettext - ~kde-base/arts-1.1.1" # this arts rev is part of the same fix - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for #7359 - -myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -use x86 && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac - use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch -} - -src_install() { - kde_src_install - dohtml *.html - - # kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild - # shouldn't install anything into kdelibs-apidocs (bug #15102) - rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs -} - -pkg_postinst() { - einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1. - If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS= - line and env-update." -} diff --git a/kde-base/kdelibs/kdelibs-3.1.ebuild b/kde-base/kdelibs/kdelibs-3.1.ebuild deleted file mode 100644 index 237d60a6673f..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.ebuild,v 1.22 2003/04/27 13:43:49 danarmak Exp $ -inherit kde -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa ipv6 cups ssl" -DESCRIPTION="KDE libraries needed by all kde programs" -KEYWORDS="x86 ppc sparc" -HOMEPAGE="http//www.kde.org/" -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire -# DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - ~kde-base/arts-1.1.0 - media-libs/libart_lgpl - app-text/ghostscript - sys-devel/gettext" - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for #7359 - -myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full" - -use alpha && append-flags -mieee - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - kde_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac -} - -src_install() { - kde_src_install - dohtml *.html - - dodir /etc/env.d -echo "PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${PREFIX}/lib -KDEDIRS=${PREFIX} -CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdelibs-${PV} # number goes down with version upgrade - - echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-${PV} # number goes up with version upgrade -} |