From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RsjNU-00072X-Fj for garchives@archives.gentoo.org; Wed, 01 Feb 2012 23:14:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2961E07AA; Wed, 1 Feb 2012 23:14:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AF851E07AA for ; Wed, 1 Feb 2012 23:14:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F9FC1B4017 for ; Wed, 1 Feb 2012 23:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4773180042 for ; Wed, 1 Feb 2012 23:14:02 +0000 (UTC) From: "Markos Chandras" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markos Chandras" Message-ID: <02473e0882210a9e7df86f7cef3c6492f5530018.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-assistant/Manifest x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild x11-libs/qt-assistant/qt-assistant-4.9999.ebuild X-VCS-Directories: x11-libs/qt-assistant/files/ x11-libs/qt-assistant/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: 02473e0882210a9e7df86f7cef3c6492f5530018 Date: Wed, 1 Feb 2012 23:14:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9e89cb2e-5121-4d58-8d3f-7fcb1014b460 X-Archives-Hash: df1f349733c9076e6089bd1e17e38d8a commit: 02473e0882210a9e7df86f7cef3c6492f5530018 Author: Markos Chandras gentoo org> AuthorDate: Wed Feb 1 23:13:33 2012 +0000 Commit: Markos Chandras gentoo org> CommitDate: Wed Feb 1 23:13:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D02473e08 x11-libs/qt-assistant: Remove obsolete patch. Does not apply to live ebui= lds --- x11-libs/qt-assistant/Manifest | 5 +- .../files/qt-assistant-4.8.0-install-fix.patch | 59 --------------= ------ x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 5 -- x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 5 -- 4 files changed, 2 insertions(+), 72 deletions(-) diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manif= est index eda7e3b..98ba021 100644 --- a/x11-libs/qt-assistant/Manifest +++ b/x11-libs/qt-assistant/Manifest @@ -1,9 +1,8 @@ AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2= b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663= d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc AUX qt-assistant-4.7-fix-compat.patch 2987 RMD160 1086b830699b5357388fa0= c1b3633c6c4c3f6bd4 SHA1 63dd8200f0a4fcbd29356fbbc11de19f13a75ed2 SHA256 e= efa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c= 32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae= 604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 -AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c5= 04585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA25= 6 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 32989= 6 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b= 7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b8= 64e58b99b64b7b5549c2d EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d1= 23f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005= ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3 -EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c= 8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e= 0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 -EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8e= baa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e= 4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 +EBUILD qt-assistant-4.8.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729= db605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84d= fb38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb +EBUILD qt-assistant-4.9999.ebuild 4415 RMD160 32ef9a76b38748e215762729db= 605272572fcd38 SHA1 fa8aff61531ff60d2d75a0a009deaaf62dec308d SHA256 84dfb= 38468451a6688ceace77b41c1304fa44946e27ea09287bbd88f5e5e36cb MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SH= A1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13= b2ac88cedf515d2508d3135ee4276babdd6098763f diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.p= atch b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch deleted file mode 100644 index f18f45e..0000000 --- a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -fix qt-assistant-4.8.0 not installing - -gentoo bug #395067 -https://bugs.gentoo.org/show_bug.cgi?id=3D395067 - ---- doc/doc.pri.org -+++ doc/doc.pri -@@ -17,11 +17,6 @@ - COPYWEBKITTARGA =3D $$QT_BUILD_TREE/doc-build/html-qt - COPYWEBKITTARGB =3D $$QT_BUILD_TREE/doc/html -=20 --EXAMPLESMANIFEST =3D $$QT_BUILD_TREE/doc/html/examples-manifest.xml --DEMOSMANIFEST =3D $$QT_BUILD_TREE/doc/html/demos-manifest.xml --EXAMPLESMANIFESTTARGET =3D $$QT_BUILD_TREE/examples --DEMOSMANIFESTTARGET =3D $$QT_BUILD_TREE/demos -- - $$unixstyle { - QDOC =3D cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=3D$$= QT_BUILD_TREE QT_SOURCE_TREE=3D$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3= $$DOCS_GENERATION_DEFINES - } else { -@@ -30,18 +25,12 @@ - COPYWEBKITGUIDE =3D $$replace(COPYWEBKITGUIDE, "/", "\\") - COPYWEBKITTARGA =3D $$replace(COPYWEBKITTARGA, "/", "\\") - COPYWEBKITTARGB =3D $$replace(COPYWEBKITTARGB, "/", "\\") -- EXAMPLESMANIFEST =3D $$replace(EXAMPLESMANIFEST, "/", "\\") -- DEMOSMANIFEST =3D $$replace(DEMOSMANIFEST, "/", "\\") -- EXAMPLESMANIFESTTARGET =3D $$replace(EXAMPLESMANIFESTTARGET, "/", = "\\") -- DEMOSMANIFESTTARGET =3D $$replace(DEMOSMANIFESTTARGET, "/", "\\") - } - ADP_DOCS_QDOCCONF_FILE =3D qt-build-docs-online.qdocconf - QT_DOCUMENTATION =3D ($$QDOC qt-api-only.qdocconf assistant.qdocconf de= signer.qdocconf \ - linguist.qdocconf qmake.qdocconf qdeclarative.qdocc= onf) && \ - (cd $$QT_BUILD_TREE && \ - $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARG= A && \ -- $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTT= ARGET && \ -- $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET = && \ - $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.= qch && \ - $$GENERATOR doc-build/html-assistant/assistant.qhp = -o doc/qch/assistant.qch && \ - $$GENERATOR doc-build/html-designer/designer.qhp -o= doc/qch/designer.qch && \ -@@ -85,14 +74,6 @@ - htmldocs.path =3D $$[QT_INSTALL_DOCS] - htmldocs.CONFIG +=3D no_check_exist directory -=20 --examplesmanifest.files =3D $$EXAMPLESMANIFEST --examplesmanifest.path =3D $$[QT_INSTALL_EXAMPLES] --examplesmanifest.CONFIG +=3D no_check_exist directory -- --demosmanifest.files =3D $$DEMOSMANIFEST --demosmanifest.path =3D $$[QT_INSTALL_DEMOS] --demosmanifest.CONFIG +=3D no_check_exist directory -- - qchdocs.files=3D $$QT_BUILD_TREE/doc/qch - qchdocs.path =3D $$[QT_INSTALL_DOCS] - qchdocs.CONFIG +=3D no_check_exist directory -@@ -104,4 +85,4 @@ - sub-qdoc3.commands +=3D (cd tools/qdoc3 && $(MAKE)) -=20 - QMAKE_EXTRA_TARGETS +=3D sub-qdoc3 adp_docs qch_docs docs docs_zh_CN do= cs_ja_JP --INSTALLS +=3D htmldocs qchdocs docimages examplesmanifest demosmanifest -+INSTALLS +=3D htmldocs qchdocs docimages diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-lib= s/qt-assistant/qt-assistant-4.8.9999.ebuild index c16ab12..97ad1d2 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild @@ -23,11 +23,6 @@ DEPEND=3D"~x11-libs/qt-gui-${PV}[aqua=3D,c++0x=3D,qpa=3D= ,debug=3D,glib=3D,qt3support=3D,trace? webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] )= " RDEPEND=3D"${DEPEND}" =20 -PATCHES=3D( - # bug 395067 - "${FILESDIR}/${P}-install-fix.patch" -) - pkg_setup() { # Pixeltool isn't really assistant related, but it relies on # the assistant libraries. doc/qch/ diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/= qt-assistant/qt-assistant-4.9999.ebuild index c16ab12..97ad1d2 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild @@ -23,11 +23,6 @@ DEPEND=3D"~x11-libs/qt-gui-${PV}[aqua=3D,c++0x=3D,qpa=3D= ,debug=3D,glib=3D,qt3support=3D,trace? webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=3D,c++0x=3D,qpa=3D,debug=3D] )= " RDEPEND=3D"${DEPEND}" =20 -PATCHES=3D( - # bug 395067 - "${FILESDIR}/${P}-install-fix.patch" -) - pkg_setup() { # Pixeltool isn't really assistant related, but it relies on # the assistant libraries. doc/qch/