[kde-base/pykde4] Remove unneeded COMMON_DEPEND variable; drop unused patch; drop patch from live

5 files changed, 9 insertions, 48 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 2fd9de9a326..a1ccdf6fd61 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,7 +1,6 @@
-AUX pykde4-kcategorydrawer.patch 1541 RMD160 ee66e94ab47b8b909178bb356ef670d75d1dd0a8 SHA1 6381e830e91d9c5982113845cd05e0e6931e2917 SHA256 7b00127541d1f01b93d0a5a09916fba75da8396ac297fda74a81d38a9ff18e43
 AUX pykde4-python3.patch 633 RMD160 336af95b915f9d207c98e11fc72068d6803ca82f SHA1 2d8cb7f0479f93f89750724ac25874e51afb2964 SHA256 8def8114ae31b1bbd835ba2caa52dc5a7847a0011f9762dc4c35a795afc24a9d
 DIST kdebindings-4.3.80.tar.bz2 5034264 RMD160 c1b5d528b5d63d96b175d72e9b06120c63c615c3 SHA1 485568172e0d4de11b49f2263d3175a2e59ce559 SHA256 dbc2848e4c5526a39aa1ee8003fa59a123f482523d01faebf20b2a93cf39ad10
-EBUILD pykde4-4.3.80.ebuild 2624 RMD160 b6935089adbfb4db13f28292a8992dbdb0956e81 SHA1 8bcc00cbc84a9bee331e548a6579b6c22a23272f SHA256 aac8485e99c6d2b2cc2e5e17d6d656a0b8e79408afeb5dad72380c91c25da874
-EBUILD pykde4-4.3.9999.ebuild 1775 RMD160 bf8dc94ec2d8c80221368fab1227b500cb1cf7a7 SHA1 5be4a1abce82ee55f418f8d9566c3cecee2db248 SHA256 a21fde45021b2583964b8187ac3bc0c2683481d21882639a7cb11be458df37ef
-EBUILD pykde4-9999.ebuild 2575 RMD160 75203e656b15dfdd73dd56bb2591345dc3f7051b SHA1 c160b060c3113812ad6f640215c779c4b25e56df SHA256 0213d056afbf628510f28805c461f9c65b9e3885421aaca424fe49b1dd6bde3e
+EBUILD pykde4-4.3.80.ebuild 2584 RMD160 617de083bbefe6484670498ca0f1908a8f23fbfd SHA1 8714e8ba09a5979260d5120bf1778baafd7f7bb7 SHA256 8779a88c1a0eaa5828dfd588fd2d6ad01d68fc69db26786c3468b408cdb4a1bc
+EBUILD pykde4-4.3.9999.ebuild 1735 RMD160 7a7b3f2a026b895048a4f317df6300ac1a127943 SHA1 1b56a84f9f147832eb87406f38353dc51350e3a3 SHA256 d8651aaec2b1a46fb14e26049c52a3cac52f62e84fa7b59b70ee84122fd450fc
+EBUILD pykde4-9999.ebuild 2487 RMD160 703941bfb6af5391bbbe3131004adbeabe061ab0 SHA1 8281e2a138307306c0931025214b87df679a92c4 SHA256 9d6e63e9e643c68ead44d50d9d4d04d4e880d7438fd4a762a1bf9f34a4aa4fd1
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
diff --git a/kde-base/pykde4/files/pykde4-kcategorydrawer.patch b/kde-base/pykde4/files/pykde4-kcategorydrawer.patch
deleted file mode 100644
index 25a6711b758..00000000000
--- a/kde-base/pykde4/files/pykde4-kcategorydrawer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- pykde4-4.3.72/python/pykde4/sip/kdeui/kcategorydrawer.sip.def	2008-07-08 13:27:45.000000000 +0400
-+++ pykde4-4.3.72/python/pykde4/sip/kdeui/kcategorydrawer.sip	2009-10-25 00:39:24.573756918 +0400
-@@ -29,6 +29,28 @@
-                             KCategoryDrawer ();
-     virtual void            drawCategory (const QModelIndex& index, int sortRole, const QStyleOption& option, QPainter* painter) const;
-     virtual int             categoryHeight (const QModelIndex& index, const QStyleOption& option) const;
-+    int                     leftMargin () const;
-+    void                    setLeftMargin (int leftMargin);
-+    int                     rightMargin () const;
-+    void                    setRightMargin (int rightMargin);
-+
-+private:
-+                            KCategoryDrawer (const KCategoryDrawer&);
- };   // KCategoryDrawer
- 
-+class KCategoryDrawerV2 : QObject, KCategoryDrawer
-+{
-+%TypeHeaderCode
-+#include <kcategorydrawer.h>
-+%End
-+
-+public:
-+                            KCategoryDrawerV2 (QObject *parent = 0);
-+    virtual void            mouseButtonPressed (const QModelIndex &index, QMouseEvent *event);
-+    virtual void            mouseButtonReleased (const QModelIndex &index, QMouseEvent *event);
-+    virtual void            mouseButtonMoved(const QModelIndex &index, QMouseEvent *event);
-+    virtual void            mouseButtonDoubleClicked(const QModelIndex &index, QMouseEvent *event);
- 
-+signals:
-+    void                    collapseOrExpandClicked(const QModelIndex &index);
-+};   // KCategoryDrawerV2
diff --git a/kde-base/pykde4/pykde4-4.3.80.ebuild b/kde-base/pykde4/pykde4-4.3.80.ebuild
index b672cff7213..879bf3b3d31 100644
--- a/kde-base/pykde4/pykde4-4.3.80.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.80.ebuild
@@ -15,15 +15,14 @@ DESCRIPTION="Python bindings for KDE4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="akonadi debug examples policykit semantic-desktop"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
-DEPEND="${COMMON_DEPEND}"
 # blocker added due to compatibility issues and error during compile time
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-python/pykde
 "
 
diff --git a/kde-base/pykde4/pykde4-4.3.9999.ebuild b/kde-base/pykde4/pykde4-4.3.9999.ebuild
index 6e545d6d837..c9020eb4c98 100644
--- a/kde-base/pykde4/pykde4-4.3.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.9999.ebuild
@@ -14,15 +14,14 @@ DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
 IUSE="akonadi debug examples policykit semantic-desktop"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
-DEPEND="${COMMON_DEPEND}"
 # blocker added due to compatibility issues and error during compile time
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-python/pykde
 "
 
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index ad5559ced71..8f22f5d3c66 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -15,22 +15,17 @@ DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
 IUSE="akonadi debug examples policykit semantic-desktop"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
-DEPEND="${COMMON_DEPEND}"
 # blocker added due to compatibility issues and error during compile time
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-python/pykde
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-python3.patch"
-)
-
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup