diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-13 16:42:04 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-13 16:42:04 +0000 |
commit | 1d268fed2eb64e84a574be2011de10bab5711628 (patch) | |
tree | 396c41049340735783c7a271db5d883d0c4b8b3b /net-im/kadu | |
parent | Version bump. (diff) | |
download | gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.tar.gz gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.tar.bz2 gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.zip |
old
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'net-im/kadu')
-rw-r--r-- | net-im/kadu/Manifest | 11 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch | 14 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch | 39 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch | 33 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.5.2-gcc44.patch | 34 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff | 162 | ||||
-rw-r--r-- | net-im/kadu/files/voice-gentoo.patch | 12 | ||||
-rw-r--r-- | net-im/kadu/files/xosd-0.6.0-gentoo.patch | 27 | ||||
-rw-r--r-- | net-im/kadu/files/xosd-gentoo.patch | 38 | ||||
-rw-r--r-- | net-im/kadu/kadu-0.6.5.2-r3.ebuild | 184 | ||||
-rw-r--r-- | net-im/kadu/kadu-0.6.5.2-r4.ebuild | 184 |
11 files changed, 0 insertions, 738 deletions
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index befa66ecb058..f962c730de40 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -1,17 +1,6 @@ -AUX kadu-0.4.3-tcltk-gcc4.patch 576 RMD160 f37fcaba6dafbc84b7bf9efd03d6708f5305195b SHA1 bc31cd2421e923b1680db7a089b8a1f5ff4032c1 SHA256 8974c9948f39100c97269e57591e0090fa017c485e89abbf5a07ece8b7299d86 -AUX kadu-0.6.0.2-kill-strip.patch 1090 RMD160 8c148f779f448a0700d44b2f51a598bf5ef240df SHA1 8a8268e5c85b91e09f2f2b261b06e14b085ffa73 SHA256 bfcc8ed6e1d2527117bdd8bebc7ea05605953acdf5cfd711bd5009ea5c221778 -AUX kadu-0.6.5.1-fix-qt4.5-encoding.patch 920 RMD160 121164df1698219aaad51eb58b9d9040d80979f7 SHA1 5948d0a37b69e85f2c5998b9e63227e7ab05598a SHA256 14654eaa0ad2f10f646d3a63ee9903fb75192146b5f748ce5d375e560a4f77c3 -AUX kadu-0.6.5.2-gcc44.patch 1018 RMD160 90e158d6297047cc42dd02c2e1c95c980ec8c25d SHA1 5292f74bc148fb9e946079b5f8ee0117138ecd2b SHA256 ae7fa3fb1a39240dd4b9deda36db19d07dd72896df77220710ca555df81f15bd AUX kadu-0.6.5.3-linkage.patch 684 RMD160 3ee58d8825f977238f7f84aa07358ba9e32ce08f SHA1 46d6da80d2c10df4ef0626ab80314da8b6a2bd33 SHA256 38528c44264d0611a947fb242a53daa370e7539b137f495d78b6242e30cf38c9 -AUX kadu-toolbar_toggle-gentoo.diff 5983 RMD160 ea7c587b4c3617c2ebb445dce46d6c275a71c0a9 SHA1 bca7202cdae4eea2d5a1d1df1cffad704cf49711 SHA256 2f39f3871c120c3ef1d720b67bb1c536762b5af1a63cf79282a679a65c63b12a AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2 -AUX voice-gentoo.patch 468 RMD160 ca260b532be75ea607807263c2b6c306f6820e8e SHA1 c8d2dff872e6611c48b71b221db2cdc450f2f029 SHA256 970a51aa1c5aa90f6f23c96b8d37255e879ee994fc1551b6e340a649c7bf5bd1 -AUX xosd-0.6.0-gentoo.patch 1506 RMD160 9b5c790159a9813fab8e8877f307bcdfae24a566 SHA1 e3d13f045df4c2fa621689c535c3c96d06e1add8 SHA256 84952020dd0db90169f2d54e23660d027612ed8d0ee5741fbd305a1ebc83ab70 -AUX xosd-gentoo.patch 1148 RMD160 d09f0f8af0701b7c56404f2ed5a744c963aa5a46 SHA1 e7c12fc41559499c8b40aae51fa04c52b5b04c0e SHA256 0d8c8dcc33e913fdf44b33d91854313633dee89eaff192aab107d0559994d7e1 -DIST kadu-0.6.5.2.tar.bz2 1554848 RMD160 0066e16bcbf2ce1098a3595fc6f7d519b0966cd3 SHA1 2515dc65222003a72e24289095b119af51f688ea SHA256 28d8e7e31a5e502217a2d5ddb93343c8c33ab09772035f32c568af0e3cc36183 DIST kadu-0.6.5.3.tar.bz2 1676317 RMD160 95609df3d2c75f765861234ee2bc2bf9eb36ab10 SHA1 0714e007e42ff4c9abecee6f9b47e62d291fb6f6 SHA256 ed2ff311d1896a6344af91e65c901d72f93e2e005989a82c6f35a4dbfced6a75 -EBUILD kadu-0.6.5.2-r3.ebuild 5277 RMD160 e0bd665aac2adb42d0c6a6952252153069d2e12d SHA1 d695c49c40023cad8d2630d593b210b07bf984e8 SHA256 caac1a85284542075ed7e27ec0a0aebb803f6d5c7de3cddfc6efc97ea55ec0bb -EBUILD kadu-0.6.5.2-r4.ebuild 5272 RMD160 502d7871a5cb89be5b1767c8463e0a307bbc9097 SHA1 df3867609e6857d1104468f129285e3f70505783 SHA256 a6c7bc19a36d221d4f27861a9b04e82610ec18c08cf33db5af27a7154afaa3aa EBUILD kadu-0.6.5.3-r1.ebuild 4806 RMD160 9bbbc700e94171990b27c6aa1dd7146aa313c443 SHA1 a55bea76549d46a4d02243d8203513adf465afcd SHA256 b405f2cec85818914b97201d3b5aa0acc38acb4a529225fcf833bac524f1a9ff MISC ChangeLog 12571 RMD160 be1d15b7230534ac0d7088bce163e860feca2aa5 SHA1 85622fa40fc9432f77f344683824ad4cf6d380f1 SHA256 c18c97e4b0cd49de333292129430b70ab3170ff0e0969b35fc0cbe31cf767db3 MISC metadata.xml 1088 RMD160 d602f869fde2034b2be803b852f4f579e5597345 SHA1 37211be0e9a625a5f269e6999d5e1c7cca3c976e SHA256 bad4a12d80618a33f8a69c2d811679129e609b5c49a2390f264a4ab4ee37cdbb diff --git a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch b/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch deleted file mode 100644 index 086fd663e0bc..000000000000 --- a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp kadu-orig/modules/tcl_scripting/tcl_scripting.h kadu/modules/tcl_scripting/tcl_scripting.h ---- kadu-orig/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:36:24.000000000 -0600 -+++ kadu/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:37:34.000000000 -0600 -@@ -65,8 +65,8 @@ class TclSession : public QObject - bool allowErrors; - - public: -- TclSession::TclSession(bool main = FALSE); -- TclSession::~TclSession(); -+ TclSession(bool main = FALSE); -+ ~TclSession(); - void addMenu(); - void delMenu(); - void menuItemSetEnabled(int idx, bool enabled); diff --git a/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch b/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch deleted file mode 100644 index b9ede5098623..000000000000 --- a/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ccbae5f87973acf551c943488c93c89ebef6f96 Mon Sep 17 00:00:00 2001 -From: Robert Buchholz <rbu@goodpoint.de> -Date: Wed, 4 Feb 2009 17:26:46 +0100 -Subject: [PATCH] Kill -s CFLAG for regular build - -Binaries are stripped using "make install-strip" and not during compile. ---- - configure.ac | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0f32cfe..30df316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -802,10 +802,6 @@ if test "$enable_debug" = "yes"; then - CXXFLAGS="$CXXFLAGS -ggdb" - CFLAGS="$CFLAGS -ggdb" - libgadu_CFLAGS="$CFLAGS -ggdb" --else -- CXXFLAGS="$CXXFLAGS -s" -- CFLAGS="$CFLAGS -s" -- libgadu_CFLAGS="$CFLAGS -s" - fi - - -@@ -820,10 +816,6 @@ if test -z "$enable_macosx"; then - SHARED_FLAGS= - fi - if test "$enable_macosx" = "yes"; then -- # -s kills dynamic modules -- CXXFLAGS="`echo $CXXFLAGS | sed 's/ -s//'`" -- CFLAGS="`echo $CFLAGS | sed 's/ -s//'`" -- - LDFLAGS="$LDFLAGS -framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL" - DYNAMIC_OPT="-dynamic" - SO_EXT="dylib" --- -1.6.0.6 - diff --git a/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch b/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch deleted file mode 100644 index d3113a0779a0..000000000000 --- a/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- branches/0.6.5/kadu-core/main.cpp 2009/01/04 13:18:33 6032 -+++ branches/0.6.5/kadu-core/main.cpp 2009/02/22 10:45:49 6261 -@@ -153,6 +153,11 @@ - } - - #endif -+ -+ kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n"); -+ new KaduApplication(argc, argv); -+ kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n"); -+ - debug_mask = -1; - qInstallMsgHandler(kaduQtMessageHandler); - xml_config_file = new XmlConfigFile(); -@@ -199,7 +204,6 @@ - if (freopen(path, "w+", stderr) == 0) - fprintf(stdout, "freopen: %s\n", strerror(errno)); - #endif -- - } - - #ifdef DEBUG_ENABLED -@@ -227,10 +231,6 @@ - exit(10); - } - -- kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n"); -- new KaduApplication(argc, argv); -- kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n"); -- - defaultFont = new QFont(qApp->font()); - defaultFontInfo = new QFontInfo(*defaultFont); - // loading translation diff --git a/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch b/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch deleted file mode 100644 index 868dd3a5165f..000000000000 --- a/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- branches/0.6.5/kadu-core/protocol.h 2009/05/14 16:31:06 6636 -+++ branches/0.6.5/kadu-core/protocol.h 2009/05/14 16:32:15 6637 -@@ -4,9 +4,9 @@ - #include <QtCore/QDateTime> - #include <QtCore/QObject> - --#ifdef __sun__ -+#if defined(__sun__ ) || defined(__linux__) - #include <sys/types.h> --#endif /* __sun__ */ -+#endif /* __sun__ || __linux__ */ - - #ifdef _MSC_VER - #include "kinttypes.h" ---- branches/0.6.5/kadu-core/protocol.h 2008/09/25 20:10:18 5602 -+++ branches/0.6.5/kadu-core/protocol.h 2009/04/24 21:11:43 6584 -@@ -14,6 +14,7 @@ - - #include "status.h" - #include "usergroup.h" -+#include <stdint.h> - - typedef uint32_t UinType; - ---- branches/0.6.5//modules/encryption/pkcs1_certificate.h 2009-07-25 15:26:05.000000000 -0400 -+++ branches/0.6.5/modules/encryption/pkcs1_certificate.h 2009-07-25 15:26:27.000000000 -0400 -@@ -26,6 +26,7 @@ - #define PKCS1_CERTIFICATE_H - - #include <QtCrypto> -+#include <stdint.h> - - /** - * PKCS#1 certificate reader/writer (implemented according to the PKCS#1 v2.1 Specification). diff --git a/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff b/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff deleted file mode 100644 index 24b931618fac..000000000000 --- a/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff +++ /dev/null @@ -1,162 +0,0 @@ -diff -aurp kadu.orig/kadu/kadu.cpp kadu/kadu/kadu.cpp ---- kadu.orig/kadu/kadu.cpp 2005-03-20 15:48:41.000000000 +0100 -+++ kadu/kadu/kadu.cpp 2005-03-20 19:07:06.000000000 +0100 -@@ -100,8 +100,21 @@ void ToolBar::createControls() - if ((*j).caption== "--separator--") - addSeparator(); - else -- (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -- QString::null, (*j).receiver, (*j).slot, this, (*j).name); -+ { -+ if ((*j).type == ToolButton::Push) -+ { -+ (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -+ QString::null, (*j).receiver, (*j).slot, this, (*j).name); -+ } -+ else -+ { -+ (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -+ QString::null, 0, 0, this, (*j).name); -+ (*j).button->setToggleButton(true); -+ (*j).button->setOn((*j).type == ToolButton::ToggleOn); -+ connect((*j).button, SIGNAL(toggled(bool)), (*j).receiver, (*j).slot); -+ } -+ } - - setStretchableWidget(new QWidget(this)); - kdebugf2(); -@@ -141,6 +154,34 @@ void ToolBar::registerButton(const QStri - RToolButton.slot= slot; - RToolButton.position= position; - RToolButton.name= name; -+ RToolButton.type= ToolButton::Push; -+ -+ if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1)) -+ RegisteredToolButtons.append(RToolButton); -+ else -+ RegisteredToolButtons.insert(RegisteredToolButtons.at(position), RToolButton); -+ -+ if(instance!=NULL) -+ instance->createControls(); -+ kdebugf2(); -+} -+ -+void ToolBar::registerToggleButton(const QString &iconname, const QString& caption, bool on, -+ QObject* receiver, const char* slot, int position, const char* name) -+{ -+ kdebugf(); -+ if(instance!=NULL) -+ instance->clear(); -+ -+ ToolButton RToolButton; -+ -+ RToolButton.iconname= iconname; -+ RToolButton.caption= caption; -+ RToolButton.receiver= receiver; -+ RToolButton.slot= slot; -+ RToolButton.position= position; -+ RToolButton.name= name; -+ RToolButton.type= on ? ToolButton::ToggleOn : ToolButton::ToggleOff; - - if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1)) - RegisteredToolButtons.append(RToolButton); -@@ -400,8 +441,10 @@ Kadu::Kadu(QWidget *parent, const char * - setActiveGroup(""); - - // dodanie przyciskow do paska narzedzi -- ToolBar::registerButton("ShowHideInactiveUsers", tr("Show / hide inactive users"), Userbox, SLOT(showHideInactive()), -1, "inactiveUsersButton"); -- ToolBar::registerButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"), Userbox, SLOT(showHideDescriptions()), -1, "withDescriptionUsersButton"); -+ ToolBar::registerToggleButton("ShowHideInactiveUsers", tr("Show / hide inactive users"), -+ config_file.readBoolEntry("General","ShowHideInactive"), Userbox, SLOT(showHideInactive(bool)), -1, "inactiveUsersButton"); -+ ToolBar::registerToggleButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"), -+ config_file.readBoolEntry("General","ShowOnlyDescriptionUsers"), Userbox, SLOT(showHideDescriptions(bool)), -1, "withDescriptionUsersButton"); - ToolBar::registerButton("Configuration", tr("Configuration"), this, SLOT(configure()), -1, "configurationButton"); - ToolBar::registerSeparator(); - ToolBar::registerButton("History", tr("View history"), this, SLOT(viewHistory()), -1, "historyButton"); -diff -aurp kadu.orig/kadu/kadu.h kadu/kadu/kadu.h ---- kadu.orig/kadu/kadu.h 2005-03-20 15:48:41.000000000 +0100 -+++ kadu/kadu/kadu.h 2005-03-20 19:02:48.000000000 +0100 -@@ -35,6 +35,12 @@ class ToolBar : public QToolBar - QString slot; - QToolButton* button; - int position; -+ enum -+ { -+ Push, -+ ToggleOff, -+ ToggleOn -+ } type; - }; - static QValueList<ToolButton> RegisteredToolButtons; - void createControls(); -@@ -44,6 +50,8 @@ class ToolBar : public QToolBar - ~ToolBar(); - static void registerButton(const QString &iconname, const QString& caption, - QObject* receiver, const char* slot, const int position=-1, const char* name=""); -+ static void registerToggleButton(const QString &iconname, const QString& caption, bool on, -+ QObject* receiver, const char* slot, const int position=-1, const char* name=""); - static void unregisterButton(const char* name); - static void registerSeparator(int position=-1); - static QToolButton* getButton(const char* name); -diff -aurp kadu.orig/kadu/userbox.cpp kadu/kadu/userbox.cpp ---- kadu.orig/kadu/userbox.cpp 2005-03-20 15:48:42.000000000 +0100 -+++ kadu/kadu/userbox.cpp 2005-03-20 18:08:42.000000000 +0100 -@@ -678,6 +678,14 @@ void UserBox::showHideInactive() - kdebugf2(); - } - -+void UserBox::showHideInactive(bool state) -+{ -+ kdebugf(); -+ config_file.writeEntry("General","ShowHideInactive",state); -+ all_refresh(); -+ kdebugf2(); -+} -+ - void UserBox::showHideDescriptions() - { - kdebugf(); -@@ -685,6 +693,13 @@ void UserBox::showHideDescriptions() - all_refresh(); - } - -+void UserBox::showHideDescriptions(bool state) -+{ -+ kdebugf(); -+ config_file.writeEntry("General","ShowOnlyDescriptionUsers",state); -+ all_refresh(); -+} -+ - UinsList UserBox::getSelectedUins() const - { - kdebugf(); -diff -aurp kadu.orig/kadu/userbox.h kadu/kadu/userbox.h ---- kadu.orig/kadu/userbox.h 2005-03-20 15:48:42.000000000 +0100 -+++ kadu/kadu/userbox.h 2005-03-20 17:58:14.000000000 +0100 -@@ -418,12 +418,26 @@ class UserBox : public QListBox , QToolT - void showHideInactive(); - - /** -+ \fn void showHideInactive() -+ Przełącza tryb pokazywania kontaktów niedostępnych. -+ \param state Jeśli true - kontakty nieaktywne sa widoczne -+ **/ -+ void showHideInactive(bool state); -+ -+ /** - \fn void showHideDescriptions() - Przełącza tryb pokazywania opisów kontaktów. - **/ - void showHideDescriptions(); - - /** -+ \fn void showHideDescriptions() -+ Przełącza tryb pokazywania opisów kontaktów. -+ \param state Jeśli true - kontakty bez opisow sa ukryte -+ **/ -+ void showHideDescriptions(bool state); -+ -+ /** - \fn virtual void clear() - Czyśli listę. - **/ diff --git a/net-im/kadu/files/voice-gentoo.patch b/net-im/kadu/files/voice-gentoo.patch deleted file mode 100644 index 536364f4f0cc..000000000000 --- a/net-im/kadu/files/voice-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kadu.orig/modules/voice/libgsm/src/code.c kadu/modules/voice/libgsm/src/code.c ---- kadu.orig/modules/voice/libgsm/src/code.c 2008-02-12 11:19:33.000000000 +0000 -+++ kadu/modules/voice/libgsm/src/code.c 2008-02-12 11:20:47.000000000 +0000 -@@ -7,7 +7,7 @@ - /* $Header: /var/cvsroot/gentoo-x86/net-im/kadu/files/voice-gentoo.patch,v 1.1 2008/02/13 01:43:35 cla Exp $ */ - - #include "config.h" -- -+#include <string.h> - - #ifdef HAS_STDLIB_H - #include <stdlib.h> diff --git a/net-im/kadu/files/xosd-0.6.0-gentoo.patch b/net-im/kadu/files/xosd-0.6.0-gentoo.patch deleted file mode 100644 index 274bccdfd6ec..000000000000 --- a/net-im/kadu/files/xosd-0.6.0-gentoo.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in kadu/modules/xosd_notify/gtkfontdialog/Makefile.in ---- kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in 2008-02-12 10:58:41.000000000 +0000 -+++ kadu/modules/xosd_notify/gtkfontdialog/Makefile.in 2008-02-12 11:01:58.000000000 +0000 -@@ -1,5 +1,5 @@ --CFLAGS:=$(CFLAGS) `gtk-config --cflags` --LDFLAGS:=$(LDFLAGS) `gtk-config --libs` -+CFLAGS:=$(CFLAGS) `pkg-config gtk+-2.0 --cflags` -+LDFLAGS:=$(LDFLAGS) `pkg-config gtk+-2.0 --libs` - - all: gtkfontdialog - ln -f gtkfontdialog ../bin/ -diff -Naur kadu.orig/modules/xosd_notify/spec kadu/modules/xosd_notify/spec ---- kadu.orig/modules/xosd_notify/spec 2008-02-12 10:58:41.000000000 +0000 -+++ kadu/modules/xosd_notify/spec 2008-02-12 11:00:35.000000000 +0000 -@@ -8,10 +8,10 @@ - MODULE_LDFLAGS="$PTHREAD_LDFLAGS $PTHREAD_LIBS" - - MODULE_3RDPARTY="gtkfontdialog" --MODULE_TOOLS="gtk-config" -+MODULE_TOOLS="pkg-config" - MODULE_CONFIGURE_CMD=' - TOOL_DIRS2=`echo $TOOL_DIRS | sed -e "s/\//\\\\\\\\\//g"` --sed -e "s/gtk-config/$TOOL_DIRS2\/gtk-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile -+sed -e "s/pkg-config/$TOOL_DIRS2\/pkg-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile - - echo -e "#include <xosd.h>\nint main(){xosd_create(1);return 0;}\n" > xosdtest.c - ret=`$CC $CXXFLAGS $MODULE_CXXFLAGS xosdtest.c $LDFLAGS $MODULE_LDFLAGS -o xosdtest 2>/dev/null >/dev/null && echo 1` diff --git a/net-im/kadu/files/xosd-gentoo.patch b/net-im/kadu/files/xosd-gentoo.patch deleted file mode 100644 index 066d90c9dbd4..000000000000 --- a/net-im/kadu/files/xosd-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- modules/xosd_notify/xosd_notify.cpp.orig 2005-02-27 16:21:08.000000000 +0100 -+++ modules/xosd_notify/xosd_notify.cpp 2005-03-18 11:56:17.521249672 +0100 -@@ -51,7 +51,7 @@ - "NewChat"<<"NewMessage"<<"Error"<<"OtherMessage"; - - int val; -- CONST_FOREACH(it, optionPrefixes) -+ FOREACH(it, optionPrefixes) - { - config_file.addVariable("XOSD", (*it)+"Position", 4); - val = config_file.readNumEntry("XOSD", (*it)+"Position"); -@@ -392,7 +392,7 @@ - } - - int y_offset = config_file.readNumEntry("XOSD", QString("OffsetY%1").arg(position)); -- CONST_FOREACH(line, lines[position]) -+ FOREACH(line, lines[position]) - { - xosd_set_vertical_offset((*line).handle, y_offset); - xosd_hide((*line).handle); -@@ -456,7 +456,7 @@ - toggled_SetAll(config_file.readBoolEntry("XOSD", "SetAll")); - - configs.clear(); -- CONST_FOREACH(prefix, optionPrefixes) -+ FOREACH(prefix, optionPrefixes) - { - TestConfig c; - c.type = *prefix; -@@ -498,7 +498,7 @@ - { - kdebugf(); - -- CONST_FOREACH(prefix, optionPrefixes) -+ FOREACH(prefix, optionPrefixes) - { - TestConfig c = configs[*prefix]; - config_file.writeEntry("XOSD", (*prefix)+"Position", c.position); diff --git a/net-im/kadu/kadu-0.6.5.2-r3.ebuild b/net-im/kadu/kadu-0.6.5.2-r3.ebuild deleted file mode 100644 index 691937e7ac97..000000000000 --- a/net-im/kadu/kadu-0.6.5.2-r3.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.2-r3.ebuild,v 1.1 2009/08/11 11:43:43 scarabeus Exp $ - -EAPI="2" -inherit base cmake-utils flag-o-matic - -DESCRIPTION="QT client for popular in Poland Gadu-Gadu instant messaging network" -HOMEPAGE="http://www.kadu.net" -SRC_URI="http://www.kadu.net/download/stable/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -SLOT="0" -IUSE="alsa amarok amarok2 ao audacious +avatar config_wizard dragonplayer -oss sms spell +ssl vlc voice" - -COMMON_DEPEND=" - >=app-crypt/qca-2.0.0-r2 - >=media-libs/libsndfile-1.0 - >=net-libs/libgadu-1.8[threads] - >=x11-libs/qt-dbus-4.4:4 - >=x11-libs/qt-gui-4.4:4 - >=x11-libs/qt-webkit-4.4:4 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - spell? ( app-text/aspell ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/cmake-2.6 -" -RDEPEND="${COMMON_DEPEND} - amarok? ( media-sound/amarok:3.5 ) - amarok2? ( media-sound/amarok:4 ) - audacious? ( media-sound/audacious ) - dragonplayer? ( kde-base/dragonplayer ) - ssl? ( app-crypt/qca-ossl:2 ) - vlc? ( media-video/vlc ) -" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/libgsm-ugly-code.patch" - "${FILESDIR}/${P}-gcc44.patch" -) - -# set given .config variable to =m or =y -# args: <variable> <m/y> -config_enable() { - sed -i -e "s/^\(${1}=\)./\1${2}/" .config || die "config_enable failed" -} - -src_prepare() { - # Autopatcher - base_src_prepare - - # Multilib - sed -i -e 's|${CMAKE_INSTALL_PREFIX}/lib|${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}|' \ - CMakeLists.txt || die "failed to apply multilib installation patch" - find modules -name CMakeLists.txt \ - -exec sed -i -e 's|lib/kadu/modules|lib${LIB_SUFFIX}/kadu/modules|' {} + \ - || die "failed to fix multilib paths for modules" - - # Create .config file with all variables defaulted to =n - sed -i -n -e "s/=\(m\|y\)/=n/" -e "/^[a-z]/p" .config \ - || die ".config creation failed" - - # Common modules - config_enable module_gadu_protocol y - config_enable module_account_management m - config_enable module_advanced_userlist m - config_enable module_antistring m - config_enable module_auto_hide m - config_enable module_autoaway m - config_enable module_autoresponder m - config_enable module_autostatus m - config_enable module_cenzor m - config_enable module_dcc m - config_enable module_desktop_docking m - config_enable module_docking m - config_enable module_echo m - config_enable module_exec_notify m - config_enable module_ext_sound m - config_enable module_filedesc m - config_enable module_filtering m - config_enable module_firewall m - config_enable module_hints m - config_enable module_history m - config_enable module_last_seen m - config_enable module_notify m - config_enable module_parser_extender m - config_enable module_pcspeaker m - config_enable module_qt4_docking m - config_enable module_qt4_sound m - config_enable module_screenshot m - config_enable module_sound m - config_enable module_window_notify m - config_enable module_word_fix m - config_enable module_nextinf m - config_enable module_idle m - config_enable module_tabs m - config_enable module_plus_pl_sms m - - # Media players - if use amarok || use amarok2 || use audacious || use dragonplayer || use vlc; then - config_enable module_mediaplayer m - use amarok && config_enable amarok1_mediaplayer m - use amarok2 && config_enable amarok2_mediaplayer m - use audacious && config_enable audacious_mediaplayer m - use dragonplayer && config_enable dragon_mediaplayer m - # falf_mediaplayer - # itunes_mediaplayer - use vlc && config_enable vlc_mediaplayer m - # xmms2_mediaplayer - # xmms_mediaplayer - fi - - # Audio outputs - use alsa && config_enable module_alsa_sound m - use ao && config_enable module_ao_sound m - use oss && config_enable module_dsp_sound m - - # Misc stuff - use config_wizard && config_enable module_config_wizard m - use spell && config_enable module_spellchecker m - use ssl && config_enable module_encryption m - use voice && config_enable module_voice m - use avatar && config_enable module_gg_avatars m - - # SMS related modules - if use sms; then - config_enable module_default_sms m - config_enable module_sms m - fi - - # Icons - config_enable icons_default y - # Uncomment when available - # config_enable icons_glass16 y - # config_enable icons_glass22 y - # config_enable icons_kadu05 y - # config_enable icons_oxygen16 y - # config_enable icons_tango16 y - - # Emoticons - config_enable emoticons_penguins y - # Uncomment when available - # config_enable emoticons_gg6_compatible y - # config_enable emoticons_tango y - - # Sound themes - config_enable sound_default y - # Uncomment when available - # config_enable sound_bns y - # config_enable sound_drums y - # config_enable sound_florkus y - # config_enable sound_michalsrodek y - # config_enable sound_percussion y - # config_enable sound_ultr y -} - -src_configure() { - # Filter out dangerous flags - filter-flags -fno-rtti - strip-unsupported-flags - - # Ensure -DQT_NO_DEBUG is added - append-cppflags -DQT_NO_DEBUG - - # Configure package - mycmakeargs="${mycmakeargs} - -D BUILD_DESCRIPTION:STRING=Gentoo Linux - -D ENABLE_AUTDOWNLOAD:BOOL=NO" - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # delete unneeded .a files from modules directory - rm -f "${D}"/usr/lib/kadu/modules/*.a -} diff --git a/net-im/kadu/kadu-0.6.5.2-r4.ebuild b/net-im/kadu/kadu-0.6.5.2-r4.ebuild deleted file mode 100644 index 5ff6f6d01e30..000000000000 --- a/net-im/kadu/kadu-0.6.5.2-r4.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.2-r4.ebuild,v 1.1 2009/09/14 22:03:49 cla Exp $ - -EAPI="2" -inherit base cmake-utils flag-o-matic - -DESCRIPTION="QT client for popular in Poland Gadu-Gadu instant messaging network" -HOMEPAGE="http://www.kadu.net" -SRC_URI="http://www.kadu.net/download/stable/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -SLOT="0" -IUSE="alsa amarok amarok2 ao audacious +avatar config_wizard dragonplayer -oss sms spell +ssl vlc voice" - -COMMON_DEPEND=" - >=app-crypt/qca-2.0.0-r2 - >=media-libs/libsndfile-1.0 - >=net-libs/libgadu-1.8[threads] - >=x11-libs/qt-dbus-4.4:4 - >=x11-libs/qt-gui-4.4:4 - >=x11-libs/qt-webkit-4.4:4 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - spell? ( app-text/aspell ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/cmake-2.6 -" -RDEPEND="${COMMON_DEPEND} - amarok? ( media-sound/amarok:3.5 ) - amarok2? ( media-sound/amarok:4 ) - audacious? ( media-sound/audacious ) - dragonplayer? ( kde-base/dragonplayer ) - ssl? ( app-crypt/qca-ossl:2 ) - vlc? ( media-video/vlc ) -" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/libgsm-ugly-code.patch" - "${FILESDIR}/${P}-gcc44.patch" -) - -# set given .config variable to =m or =y -# args: <variable> <m/y> -config_enable() { - sed -i -e "s/^\(${1}=\)./\1${2}/" .config || die "config_enable failed" -} - -src_prepare() { - # Autopatcher - base_src_prepare - - # Multilib - sed -i -e 's|${CMAKE_INSTALL_PREFIX}/lib|${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}|' \ - CMakeLists.txt || die "failed to apply multilib installation patch" - find modules -name CMakeLists.txt \ - -exec sed -i -e 's|lib/kadu/modules|lib${LIB_SUFFIX}/kadu/modules|' {} + \ - || die "failed to fix multilib paths for modules" - - # Create .config file with all variables defaulted to =n - sed -i -n -e "s/=\(m\|y\)/=n/" -e "/^[a-z]/p" .config \ - || die ".config creation failed" - - # Common modules - config_enable module_gadu_protocol y - config_enable module_account_management m - config_enable module_advanced_userlist m - config_enable module_antistring m - config_enable module_auto_hide m - config_enable module_autoaway m - config_enable module_autoresponder m - config_enable module_autostatus m - config_enable module_cenzor m - config_enable module_dcc m - config_enable module_desktop_docking m - config_enable module_docking m - config_enable module_echo m - config_enable module_exec_notify m - config_enable module_ext_sound m - config_enable module_filedesc m - config_enable module_filtering m - config_enable module_firewall m - config_enable module_hints m - config_enable module_history m - config_enable module_last_seen m - config_enable module_notify m - config_enable module_parser_extender m - config_enable module_pcspeaker m - config_enable module_qt4_docking m - config_enable module_qt4_sound m - config_enable module_screenshot m - config_enable module_sound m - config_enable module_window_notify m - config_enable module_word_fix m - config_enable module_nextinfo m - config_enable module_idle m - config_enable module_tabs m - config_enable module_plus_pl_sms m - - # Media players - if use amarok || use amarok2 || use audacious || use dragonplayer || use vlc; then - config_enable module_mediaplayer m - use amarok && config_enable amarok1_mediaplayer m - use amarok2 && config_enable amarok2_mediaplayer m - use audacious && config_enable audacious_mediaplayer m - use dragonplayer && config_enable dragon_mediaplayer m - # falf_mediaplayer - # itunes_mediaplayer - use vlc && config_enable vlc_mediaplayer m - # xmms2_mediaplayer - # xmms_mediaplayer - fi - - # Audio outputs - use alsa && config_enable module_alsa_sound m - use ao && config_enable module_ao_sound m - use oss && config_enable module_dsp_sound m - - # Misc stuff - use config_wizard && config_enable module_config_wizard m - use spell && config_enable module_spellchecker m - use ssl && config_enable module_encryption m - use voice && config_enable module_voice m - use avatar && config_enable module_gg_avatars m - - # SMS related modules - if use sms; then - config_enable module_default_sms m - config_enable module_sms m - fi - - # Icons - config_enable icons_default y - # Uncomment when available - # config_enable icons_glass16 y - # config_enable icons_glass22 y - # config_enable icons_kadu05 y - # config_enable icons_oxygen16 y - # config_enable icons_tango16 y - - # Emoticons - config_enable emoticons_penguins y - # Uncomment when available - # config_enable emoticons_gg6_compatible y - # config_enable emoticons_tango y - - # Sound themes - config_enable sound_default y - # Uncomment when available - # config_enable sound_bns y - # config_enable sound_drums y - # config_enable sound_florkus y - # config_enable sound_michalsrodek y - # config_enable sound_percussion y - # config_enable sound_ultr y -} - -src_configure() { - # Filter out dangerous flags - filter-flags -fno-rtti - strip-unsupported-flags - - # Ensure -DQT_NO_DEBUG is added - append-cppflags -DQT_NO_DEBUG - - # Configure package - mycmakeargs="${mycmakeargs} - -D BUILD_DESCRIPTION:STRING=Gentoo Linux - -D ENABLE_AUTDOWNLOAD:BOOL=NO" - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # delete unneeded .a files from modules directory - rm -f "${D}"/usr/lib/kadu/modules/*.a -} |