From 10f90ed7dcf9efa9b97538ed1f192265d0602512 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Mon, 9 Nov 2009 10:53:37 +0000 Subject: Drop unneeded patches Package-Manager: portage--svn/cvs/Linux i686 --- x11-libs/qscintilla/ChangeLog | 6 +++++- x11-libs/qscintilla/Manifest | 4 +--- x11-libs/qscintilla/files/qscintilla-2.1-qt.patch | 14 -------------- x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch | 19 ------------------- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 x11-libs/qscintilla/files/qscintilla-2.1-qt.patch delete mode 100644 x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch (limited to 'x11-libs/qscintilla') diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index cdf4c010bdfc..4c5f15490876 100644 --- a/x11-libs/qscintilla/ChangeLog +++ b/x11-libs/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.35 2009/11/05 17:09:09 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.36 2009/11/09 10:53:36 abcd Exp $ + + 09 Nov 2009; Jonathan Callen + -files/qscintilla-2.1-qt.patch, -files/qscintilla-2.1-qt4.patch: + Drop unneeded patches 05 Nov 2009; Ben de Groot +qscintilla-1.7.1.ebuild: Also restoring 1.7.1 for hppa. diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index ff43826f7cef..504b6fa80224 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,7 +1,5 @@ AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa48ce72 SHA1 f8625430db1692006e927f84110779786c281c2b SHA256 e1086b472285474fa3591a3bd9eb6b064a448e48d105f84b2fdd2c6977bcec8b AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 SHA1 1bfb73303bab3251cf7351b6d6302c212880d705 SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d -AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9 -AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22 AUX qscintilla-2.2-qt.patch 347 RMD160 8585ed1b9e525b57663ed5f4e0b0c6500e9b9a7d SHA1 8b97babbbd05ad7d22b1a93c105ac83eaf57ea02 SHA256 9ef628c4546be47ba1eb32e13f2d56c40c0b8c26ea6990b979bc5c73540c9545 AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed SHA1 84a6e4cab7aaed4d7ffa3286e7e31809ba0367f2 SHA256 9996813f9c512bc702c85dea920351770becfbdc9034f7b4babad41de8eea14d AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78 @@ -13,5 +11,5 @@ EBUILD qscintilla-1.5.1.ebuild 2056 RMD160 5b6eecfe28d4e20b9e477babb0bf119f05ffc EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 96542d9c579ef2e81ea8ef1f893c0445a83fb136 SHA1 f0aa09572e6933dffd436c30547b4e4e68030154 SHA256 5d5a6b12c2dba8d784ddba803ada081312ccb144202fc6d18d80ca67a6213a23 EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9 EBUILD qscintilla-2.4.ebuild 2414 RMD160 96af66677f51dee27f0ab965264327cbe19b7c5d SHA1 b909d75a5c93388b1e1b7d05efbb8de07875c291 SHA256 10bd9cbb7b670da9f2f3f84634fe3ce4f59981be25d0b232d3eb44bbe00e3ce4 -MISC ChangeLog 15294 RMD160 4047bb4e3d2f3cb03d8510f63084d48f090f64cd SHA1 1e226d5df1e4c3b84470e0d35b34fce252139492 SHA256 b79718242bee81bb77215fc8a2fddb8bb4746024a3989bc590477f2424d07443 +MISC ChangeLog 15433 RMD160 a667d01548295249ef80e909fd58b9c923fb64d2 SHA1 91e1826e2160b54d31d15dbb700b8b34d09b1fce SHA256 46013869299746b02444cbd63c6a599c88ce7de8e6ddded86c38b19571ea51fc MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d diff --git a/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch deleted file mode 100644 index 3579ea2400af..000000000000 --- a/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- designer.pro.orig 2006-09-16 09:07:21.000000000 -0700 -+++ designer.pro 2007-06-24 18:57:47.000000000 -0700 -@@ -5,8 +5,10 @@ - TARGET = qscintillaplugin - DESTDIR = $(QTDIR)/plugins/designer - -+INCLUDEPATH = ../Qt3 -+ - CONFIG += qt warn_on release plugin - - SOURCES += qscintillaplugin.cpp - --LIBS += -lqscintilla2 -+LIBS += -L../Qt3/lib -lqscintilla2 diff --git a/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch b/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch deleted file mode 100644 index 646e38f45dbb..000000000000 --- a/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- designer.pro.ori 2006-12-13 09:31:54.000000000 +0700 -+++ designer.pro 2006-12-13 09:40:49.000000000 +0700 -@@ -4,12 +4,14 @@ - TEMPLATE = lib - TARGET = qscintillaplugin - -+INCLUDEPATH = ../Qt4 -+ - CONFIG += designer release plugin - - HEADERS = qscintillaplugin.h - SOURCES = qscintillaplugin.cpp - --target.path = $$[QT_INSTALL_PLUGINS]/designer -+target.path = . - INSTALLS += target - --LIBS += -lqscintilla2 -+LIBS += -L../Qt4/lib -lqscintilla2 -- cgit v1.2.3-65-gdbad