From 582458f1e138b899dd88b30eba2cb388c1bdaa7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Sun, 18 Mar 2007 21:10:20 +0000 Subject: [PATCH] Don't overwrite the patch, as it's used by 3.2.5, thanks to mren for noticing Package-Manager: portage-2.1.2.2 --- net-irc/kvirc/ChangeLog | 7 ++- net-irc/kvirc/Manifest | 28 +++++++----- .../kvirc/files/kvirc-3.2.3-kdedir-fix.patch | 34 ++++++-------- .../kvirc/files/kvirc-svn-kdedir-fix.patch | 45 +++++++++++++++++++ net-irc/kvirc/kvirc-9999.ebuild | 6 +-- 5 files changed, 83 insertions(+), 37 deletions(-) create mode 100644 net-irc/kvirc/files/kvirc-svn-kdedir-fix.patch diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog index 60b712d00eb8..fd9cec4ef8d0 100644 --- a/net-irc/kvirc/ChangeLog +++ b/net-irc/kvirc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-irc/kvirc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.44 2007/03/18 20:14:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.45 2007/03/18 21:10:20 armin76 Exp $ + + 18 Mar 2007; Raúl Porcel + files/kvirc-3.2.3-kdedir-fix.patch, +files/kvirc-svn-kdedir-fix.patch, + kvirc-9999.ebuild: + Don't overwrite the patch, as it's used by 3.2.5, thanks to mren for noticing 18 Mar 2007; Raúl Porcel files/kvirc-3.2.3-kdedir-fix.patch: diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 013d6d17da9c..4fbcb7a8b741 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -6,10 +6,14 @@ AUX kvirc-3.2.0-gcc4.patch 1887 RMD160 9f39ed0b250d415e5c01d04c92d4520e8737f2a8 MD5 817c8b7131bde0dc8d3928e2fbc16f7c files/kvirc-3.2.0-gcc4.patch 1887 RMD160 9f39ed0b250d415e5c01d04c92d4520e8737f2a8 files/kvirc-3.2.0-gcc4.patch 1887 SHA256 ba8a5bb2f1c99506920f302cb7dd26c2437894de2127389490a9b74b7bf3e36d files/kvirc-3.2.0-gcc4.patch 1887 -AUX kvirc-3.2.3-kdedir-fix.patch 3331 RMD160 1d0300e1112001e5831a0971c133b0841a0e7058 SHA1 1bf00a5cda98313320e1f35b7cf12d919d2fd8c4 SHA256 633d3f2bba25a19e1aea201cff6b28f6521c9178a2d678c38be11460bd78c023 -MD5 b0b22983f1d1bd85b3efc8873aaf16d7 files/kvirc-3.2.3-kdedir-fix.patch 3331 -RMD160 1d0300e1112001e5831a0971c133b0841a0e7058 files/kvirc-3.2.3-kdedir-fix.patch 3331 -SHA256 633d3f2bba25a19e1aea201cff6b28f6521c9178a2d678c38be11460bd78c023 files/kvirc-3.2.3-kdedir-fix.patch 3331 +AUX kvirc-3.2.3-kdedir-fix.patch 1959 RMD160 3bad53b28e1d1276d0e8cba6a52522709c1a5ece SHA1 9dcff8dbed1f01e5f3487da083bd4a2518782cb6 SHA256 9510736742f87ba8169f7180e85aa34608986eec403a9d9c22d694661f2fe1a2 +MD5 d0cd1f064bbea92f2fd897c20e29ce43 files/kvirc-3.2.3-kdedir-fix.patch 1959 +RMD160 3bad53b28e1d1276d0e8cba6a52522709c1a5ece files/kvirc-3.2.3-kdedir-fix.patch 1959 +SHA256 9510736742f87ba8169f7180e85aa34608986eec403a9d9c22d694661f2fe1a2 files/kvirc-3.2.3-kdedir-fix.patch 1959 +AUX kvirc-svn-kdedir-fix.patch 3331 RMD160 1d0300e1112001e5831a0971c133b0841a0e7058 SHA1 1bf00a5cda98313320e1f35b7cf12d919d2fd8c4 SHA256 633d3f2bba25a19e1aea201cff6b28f6521c9178a2d678c38be11460bd78c023 +MD5 b0b22983f1d1bd85b3efc8873aaf16d7 files/kvirc-svn-kdedir-fix.patch 3331 +RMD160 1d0300e1112001e5831a0971c133b0841a0e7058 files/kvirc-svn-kdedir-fix.patch 3331 +SHA256 633d3f2bba25a19e1aea201cff6b28f6521c9178a2d678c38be11460bd78c023 files/kvirc-svn-kdedir-fix.patch 3331 DIST kvirc-3.2.0-linking-fix.patch.bz2 4266 RMD160 89b10577cf219a4b5b9e5502a40561dda9593655 SHA1 99f6f2bb6440214f1970de90c17ef0c4ff80c097 SHA256 d6aeb8f95c00bb1108e39236b3e59bda6eab6efe0ff16037c7f8cb8b018efaa8 DIST kvirc-3.2.0.tar.bz2 3704445 RMD160 c23d5154eaaa9afc88b0c9f6afbda0939c327cf4 SHA1 890871ffc76b62d6e538db80b1f4162a7792769d SHA256 ef4ad991578230db6c0bb8e7335304eac23996fedae682761c8b08ba89552984 DIST kvirc-3.2.5.tar.bz2 4781012 RMD160 19bd7c6c0fd6bbe0d1423920963ce2ace1c81f2f SHA1 f1944e301c154bdc4bc33bc22a816ebc37e573ca SHA256 1454e48ff6fb33e3a18991fa37775cd5cad80c11f08824a279e4f6b0b0dd03d5 @@ -21,14 +25,14 @@ EBUILD kvirc-3.2.5.ebuild 1861 RMD160 b7686de5e59ebd76c0f5c92e014a62d373cb1aa1 S MD5 5a6f58a92ab45163f73b86042e98908a kvirc-3.2.5.ebuild 1861 RMD160 b7686de5e59ebd76c0f5c92e014a62d373cb1aa1 kvirc-3.2.5.ebuild 1861 SHA256 c68eae03d444b0ce9f14dcb6082720776ca4001328249f400bc65d5b3aa30da5 kvirc-3.2.5.ebuild 1861 -EBUILD kvirc-9999.ebuild 1798 RMD160 36805c1b55276123e562642fc5ab780e23f9f6d1 SHA1 4c3b6a99a8cdb72a52a51ea232c8dd95a3bdbb1c SHA256 233dc1cd2e64f77f5f35e0ab5b367d6581799fcea9f37f12e32f71b5b1758267 -MD5 db773100ee50141962847eea0cf04076 kvirc-9999.ebuild 1798 -RMD160 36805c1b55276123e562642fc5ab780e23f9f6d1 kvirc-9999.ebuild 1798 -SHA256 233dc1cd2e64f77f5f35e0ab5b367d6581799fcea9f37f12e32f71b5b1758267 kvirc-9999.ebuild 1798 -MISC ChangeLog 7445 RMD160 db32cae5a2fba869fc669ec1868754e845a2ae96 SHA1 ab7e613e0be4347c6c1164f113b3185b0d0aff4b SHA256 0f67a9d09431084a634e921a7aa854b1f42da692ff589a0813c9f06b42a9ed7b -MD5 4ee2c4ec7c142400bac74dc75e6ecca3 ChangeLog 7445 -RMD160 db32cae5a2fba869fc669ec1868754e845a2ae96 ChangeLog 7445 -SHA256 0f67a9d09431084a634e921a7aa854b1f42da692ff589a0813c9f06b42a9ed7b ChangeLog 7445 +EBUILD kvirc-9999.ebuild 1798 RMD160 d6d3d999cbc7f7cf3375c0c4276eb4f294fa0279 SHA1 898bccdc4e88bb8fa91dae54d067f4dc3ab4393f SHA256 f6be5ee8194322bb20bc6933972fa14f3ded0d9f27690fe61edda54973562745 +MD5 683b27101f3c21d9fc910449e0570ac6 kvirc-9999.ebuild 1798 +RMD160 d6d3d999cbc7f7cf3375c0c4276eb4f294fa0279 kvirc-9999.ebuild 1798 +SHA256 f6be5ee8194322bb20bc6933972fa14f3ded0d9f27690fe61edda54973562745 kvirc-9999.ebuild 1798 +MISC ChangeLog 7669 RMD160 6e27f73e439c5179f4e4a4004ec1b37334d47d49 SHA1 3451e8611dc38c56865f6cfe81662993c0285c8f SHA256 0d53f8d65612380584adbbd63e7e5dd82e176c690c4cf3fc49cc782a97efcaff +MD5 ddd488441909ebfd83e46fb39e52e41a ChangeLog 7669 +RMD160 6e27f73e439c5179f4e4a4004ec1b37334d47d49 ChangeLog 7669 +SHA256 0d53f8d65612380584adbbd63e7e5dd82e176c690c4cf3fc49cc782a97efcaff ChangeLog 7669 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160 diff --git a/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch b/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch index 0446d75b5f61..32f688744d4f 100644 --- a/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch +++ b/net-irc/kvirc/files/kvirc-3.2.3-kdedir-fix.patch @@ -1,6 +1,6 @@ ---- configure.orig 2007-03-11 02:34:39.972261007 +0100 -+++ configure 2007-03-11 02:38:37.510839805 +0100 -@@ -31245,27 +31245,27 @@ +--- configure.orig 2006-06-03 15:46:47.000000000 +0200 ++++ configure 2006-06-03 15:52:42.000000000 +0200 +@@ -30486,23 +30486,23 @@ if test -n "$SS_KDE_SERVICESDIR"; then @@ -16,30 +16,22 @@ - iconapps32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/apps" - iconapps48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/apps" - iconapps64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/apps" -- iconapps128datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/128x128/apps" -- iconappsscalabledatadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/scalable/apps" - iconmime16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/mimetypes" - iconmime32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/mimetypes" - iconmime48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/mimetypes" - iconmime64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/mimetypes" -- iconmime128datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/128x128/mimetypes" -- iconmimescalabledatadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/scalable/mimetypes" - applnkdir="$SS_KDE_GENERAL_DIR/share/applnk/Internet" - mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text" -+ iconapps16datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/16x16/apps" -+ iconapps32datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/32x32/apps" -+ iconapps48datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/48x48/apps" -+ iconapps64datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/64x64/apps" -+ iconapps128datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/128x128/apps" -+ iconappsscalabledatadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/scalable/apps" -+ iconmime16datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/16x16/mimetypes" -+ iconmime32datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/32x32/mimetypes" -+ iconmime48datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/48x48/mimetypes" -+ iconmime64datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/64x64/mimetypes" -+ iconmime128datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/128x128/mimetypes" -+ iconmimescalabledatadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/scalable/mimetypes" -+ applnkdir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/applnk/Internet" -+ mimelnkdir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/mimelnk/text" ++ iconapps16datadir="\${exec_prefix}/share/icons/hicolor/16x16/apps" ++ iconapps32datadir="\${exec_prefix}/share/icons/hicolor/32x32/apps" ++ iconapps48datadir="\${exec_prefix}/share/icons/hicolor/48x48/apps" ++ iconapps64datadir="\${exec_prefix}/share/icons/hicolor/64x64/apps" ++ iconmime16datadir="\${exec_prefix}/share/icons/hicolor/16x16/mimetypes" ++ iconmime32datadir="\${exec_prefix}/share/icons/hicolor/32x32/mimetypes" ++ iconmime48datadir="\${exec_prefix}/share/icons/hicolor/48x48/mimetypes" ++ iconmime64datadir="\${exec_prefix}/share/icons/hicolor/64x64/mimetypes" ++ applnkdir="\${exec_prefix}/share/applnk/Internet" ++ mimelnkdir="\${exec_prefix}/share/mimelnk/text" else iconapps16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16" iconapps32datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/32x32" diff --git a/net-irc/kvirc/files/kvirc-svn-kdedir-fix.patch b/net-irc/kvirc/files/kvirc-svn-kdedir-fix.patch new file mode 100644 index 000000000000..0446d75b5f61 --- /dev/null +++ b/net-irc/kvirc/files/kvirc-svn-kdedir-fix.patch @@ -0,0 +1,45 @@ +--- configure.orig 2007-03-11 02:34:39.972261007 +0100 ++++ configure 2007-03-11 02:38:37.510839805 +0100 +@@ -31245,27 +31245,27 @@ + + + if test -n "$SS_KDE_SERVICESDIR"; then +- kdeservicesdir="$SS_KDE_SERVICESDIR" ++ kdeservicesdir="\${exec_prefix}/share/services" + else + kdeservicesdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/protocols" + fi + + + if test "$SS_KDE_REQUESTED" = "yes"; then +- iconapps16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/apps" +- iconapps32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/apps" +- iconapps48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/apps" +- iconapps64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/apps" +- iconapps128datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/128x128/apps" +- iconappsscalabledatadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/scalable/apps" +- iconmime16datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/16x16/mimetypes" +- iconmime32datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/32x32/mimetypes" +- iconmime48datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/48x48/mimetypes" +- iconmime64datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/64x64/mimetypes" +- iconmime128datadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/128x128/mimetypes" +- iconmimescalabledatadir="$SS_KDE_GENERAL_DIR/share/icons/hicolor/scalable/mimetypes" +- applnkdir="$SS_KDE_GENERAL_DIR/share/applnk/Internet" +- mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text" ++ iconapps16datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/16x16/apps" ++ iconapps32datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/32x32/apps" ++ iconapps48datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/48x48/apps" ++ iconapps64datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/64x64/apps" ++ iconapps128datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/128x128/apps" ++ iconappsscalabledatadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/scalable/apps" ++ iconmime16datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/16x16/mimetypes" ++ iconmime32datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/32x32/mimetypes" ++ iconmime48datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/48x48/mimetypes" ++ iconmime64datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/64x64/mimetypes" ++ iconmime128datadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/128x128/mimetypes" ++ iconmimescalabledatadir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/icons/hicolor/scalable/mimetypes" ++ applnkdir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/applnk/Internet" ++ mimelnkdir=" iconapps16datadir="${exec_prefix}/share/icons/hicolor/16x16/apps"/share/mimelnk/text" + else + iconapps16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16" + iconapps32datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/32x32" diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 6a327f981b0a..41ebb97d386d 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.5 2006/12/23 22:13:00 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.6 2007/03/18 21:10:20 armin76 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -29,7 +29,7 @@ ESVN_BOOTSTRAP="./autogen.sh" src_unpack() { subversion_src_unpack - epatch ${FILESDIR}/${PN}-3.2.3-kdedir-fix.patch + epatch ${FILESDIR}/${PN}-svn-kdedir-fix.patch } src_compile() { -- 2.26.2