Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 44c63b37357939badec7802ae21954023f3e6f08..04a91e2ac4bb1ccf8eea9bbb8e5b6d3225c6bd65 100644 (file)
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.31 2015/01/26 02:28:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.32 2015/01/26 02:49:28 pesa Exp $
+
+  26 Jan 2015; Davide Pesavento <pesa@gentoo.org> -qthelp-4.8.6-r1.ebuild,
+  qthelp-4.8.6-r2.ebuild:
+  Remove old.
 
   26 Jan 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Restore correct indentation... again.

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 8cfc1bc2d64eacd3483f4665c44e5d5a1107de62..a7c2c1891d837aac73677ba1d1f2ae4fc6324f03 100644 (file)
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -10,28 +10,27 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0
 DIST qttools-opensource-src-5.3.2.tar.xz 8993140 SHA256 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e SHA512 f250e8c309e47cd5196ccc89fb5a0d384b40bbefb243f2ad9dafc6b9096bd5fa540cd471322e3601afd0b88906eebcdf03097df079c80f3816d99d5a46b473cc WHIRLPOOL da5b6ad57dc0ecf6c67d46f91b0fca0df797a92918389b385819677abaa0d8d7866acb0b4ccdcb2a326cbf679f67f0de05fb9de497d5e8c2fa8c4ea83cbf1c68
 DIST qttools-opensource-src-5.4.0.tar.xz 9261924 SHA256 5a85a096ffd30463781dc3871ad9640a510eba0086188c7943d23adc3660741a SHA512 31a830eeab29888f6af946b02586f99dc7e6a312bb1f6c7119fdff02f1b947c8192f54cbd61d46242b11ff5e1ea4ed7d1874d369cc359d2e4281f9b6fd48a943 WHIRLPOOL a0836cb0f4cc0a5b3eccea3230a4e5cf61fc04d874ac0bc7f50c4a17d8aeef5e5cc3e2c139cc671df77be56ba0bbc0f9f506f8e28b8caef2799bd57818a139cc
 EBUILD qthelp-4.8.5-r2.ebuild 3221 SHA256 557c2fb440f163e93fe5088223840c76d9b267fb0c1715e0584ed2ee3f668043 SHA512 84b2f11866c095d31c7833653ac7f65da0f8a821a5af213f4759df6d34baf749fce440004b22eabea79863b6bf204b8e0dc454be0365fdced036c8e6c5a49d21 WHIRLPOOL 2954c1bd8dc09abd85a56402854ff99477b2b434e74a70ffaa8c47c0e4ebdd5e007cc98f15c2ef69c7e1284700dc95d4423a6e785588c1316681bf9314f655ac
-EBUILD qthelp-4.8.6-r1.ebuild 3311 SHA256 28e88bb84c36d37df1c7dd13c345bf8f85b2bdfd354a1ae794f5d1a9bcf9a320 SHA512 03ebf2c8d3cc9a91650b8ee4b0852d8b085097643786fa5d5c8f7f29eb9a0c9a49ad82aa1ddef12180d301edb8d89b4ac4dd7fa33815ac3dd0616f8f3f1dc645 WHIRLPOOL 7776e0f0efdd499bdf5d9d7bc50ae0eb60653d2ae1ef6f5e18d7e6aed4f9cc7ad1dc92ea9cdcd4ee1b51a23f7869e0a57940e88313383a7ef9d532093b74f5ca
-EBUILD qthelp-4.8.6-r2.ebuild 3304 SHA256 ebfe2eeee6b79e37863afb006050938f3383674a3f53f5f71ba2cfeb4343cdbc SHA512 a475553421e273661645ba34dfcf9b4432ea9fbf191c67ec6be48a20cb2f7c3bbfb36e27c09054ed72acdcaa83d6eca01e2459b87e75e138550d645b4c44f7b0 WHIRLPOOL e979d63f9965f29b385fdfd98d4df45e4067bbaa087433737b18125e27a654aa651f5baff6dfa2feeec21f39b4a36ce0e763da7dff49447dd165406bc6ed225c
+EBUILD qthelp-4.8.6-r2.ebuild 3311 SHA256 2a27ad09db5e4b4b96adffcab58b2b3edb61bdd78fec3cadce7fb86472ce4ace SHA512 cb8a5f7da3d6cfdc9bc69db694ac939d41e45c13af0dde76f9ec4cb4b99c72a7e512299a47a6cc99ff66c8163ad863cf63de21e065267cd671787bf9ba5417e8 WHIRLPOOL 506e4c70b515a855bca136360591be73c6295af62ffc16f049ccd66170f6d7d2bed84dcf57d56c0a210f8b443b8f7103a631a74334327ce96ad265ac3190d586
 EBUILD qthelp-5.3.2.ebuild 782 SHA256 f3a982327fa2ecac9e19117f7502756b368c96471de822222993e0fb1168745b SHA512 47ed43eb0da26a223508f4c1104a2a394aa581e0056a8d6ff3ead08396892345a9220a632e6ff4aeaaafdba79ddf559ef3e848b602cf9138c6767532e0918f2b WHIRLPOOL c29c99e1941ed6bea908a3ab532411d4809b1aa3913ef2331581f626c9bf659ac952fc1cb6dbe1d16e90544e1b382e818d4bc798c6caeb50b6817ad2faf65e0a
 EBUILD qthelp-5.4.0.ebuild 788 SHA256 7d5f3b546981e70f3729ec0fd718daa834a0375bd2dcf14e4a7d410b86c446e8 SHA512 89f9b56564c9eff05cdc0019b86d0a3c5385506ee047853992449aa948d1ab73fe8329b94a2a877af78e6a82464d96f5d71996e13d4dc9c42f5bef11de2e059d WHIRLPOOL 69265e92c7cdd2b25f9a4efbc325d6cd11ee9e450fd0f1851b3958979d6f6fefa0c67bd3aca77793aee0cfc42a5555b93276ff4df1c8291a2cd4aa57af02da4d
-MISC ChangeLog 26188 SHA256 50c88060d3bf303f215b49edbd18e9c6adda818ae1999a54fba7157af86dcbef SHA512 e1640c0343b7d618a3bc626e2b017afa5a1e72daabb10d5fb27b748771640cb13197b1afe9e9ece200be7d8e454938457aa8ed6a33750ea31bd21152f6865fe4 WHIRLPOOL 24d0c0bd9278d09719122dbe3adb09655322947d94756c69d597bfabd164be17d1430d06417c7e47423d33ef8ba60427e66c25ab4b9da12fdca272ed9f80f14f
+MISC ChangeLog 26304 SHA256 3861881875c281c49631059180141c0327a8a7955374d248e552a0c0d3982436 SHA512 875336cead6ec69724dbf96e7e9d91636048a9a278521d9db1e0ebe143b3f20564864a609c934ab0286d782ee5f92d1a945d2fc3bb55f76c46b4e1dcaf82222e WHIRLPOOL 553bbf72099540763057897bb46ba7cfd3e1f969d8e073660762f1f074ac8f2a3bd509ab74b7bc1fefeee204485a7314e1680a48ce777c21c16eeced21e1eb81
 MISC metadata.xml 619 SHA256 a0279b54456f15f87f3ab0eab4f541e2273a76eeb25219e7810cc0a3a379953c SHA512 c5fbfbe51cc9ccc483f3472fa616ba62c50ab83d731e7f91917cef5fc56cd3d6afd13e250e8b4ecc3f2faff68053cbed79290363c5ac16c9a17caba1c98cad30 WHIRLPOOL 5d509445f34c0cef9ecc5ac0dc3b2f1e54c725682ab1bf0d465b988de71c6c52a30b561c0923f2885de375385b9be42e8c4288cdeb5f1bde088851d317768c03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUxaZCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUxas5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IQ0P/0/K94CZPNOSfQD7UQS4b0Hb
-jJYD/QMpxiThPs91Q+g5UEyHi4NCiJ7WgOWqtOWdzl+OrFAxbajNxdno95g2NCaD
-8oZ2Ll9Dw+iNGDo/GZur/7U9WKOhdR+8afoywd9pFXXaLlIYvWVAaI2IWdn1N9o6
-fOVl8VdnD8m9gOUhsNPMoKhKsnRMTTsOWXSs0tyK2lEC1boYM9gDEL9a71MOTptV
-S+n7GUYx8nf+GB1cC9y0GWtkDDCNUcZemaJGueCOgddHX4KJunzA8Ct7piHPSECZ
-0l6Z13RxjMgmUs2Xn+KAn82GMThI3SaRu9O7z31bAkyGAmwsQKNl/OpGvsVP9Hd9
-MfbF2IhI4k3WtKBs63PJNgSOVYVOZyvtv225g4DgMXZxFfRGU1oGGKWztFMRAo96
-n545yILOnlxMJ9uGGP7f6tKAtG1uqrAPBKojmVZzbbsHkaIdS/GJOe4OnDlf7pnE
-opEiwm52Dgel50j+CK/45gotoJRojXY3BOh+2X20+WPFNKl9/u1kRm3ytl5MciZV
-sRm5bwSfi08wzlABPoLugJT6CoXohqIsDgNUDGVHnWnGaqATZd945Xe5tOfMmZN1
-gxNcmZ238YkbBzMyaFJ2uImqALvngKC/wAB3hwUhAflD4Q3xal03AMo3VPjdUfdY
-geBMcIvfAdrz2MBHrjwS
-=KQBP
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV94nQP/2fKCnj3umjyGadp4xPjqBfW
+Fpy0V66euu97LeFA3U6cSUpkb05syahSJh9XGMN7RoDiX/U+KD4JL5uTiKaw0jRS
+PFcHINdzIYXYwFRF3GA4hPoXVRxgTLy1xHOHfl6D7bZh9Wa+hCqO3TbWti/QmRMF
+dwGH9c+W3vmha0Fss4lZdUwO6yZN+/6D0vNceqhjJ4bfdV+Ild8+OQ+zy88FwJud
+M94i8Sm6l2rYzzri0N8omYzxrZd+HubykM+TjSuBGwTFPJFm9+rmSKSqAWhax7Ln
+Vgs3EiDDDGskwLUh+SeXwToZV1M/CAD5YuhycvAQ3jxqpS6YRKe/GvL/fIVKas6l
+Dy8JEVqCSRdrMx9IfUO37eDEAmKH7KzNVGY06IY09YvjTNwzfbBxfK086Rob7aol
+Xfh7/BU3Dpo1znmc5ZiUKmby1JqMNyKEgehAFn8H8bLCOwo0AcO3KJr61Hs1emAC
+kkdr7iFwtfaE0uG2s+1jProbsEcz13wObaLuNMolHmEQEW+JPYmChBzEr6/4FoRU
+W4zG9udattjmHEhex7ulOK2ynAdoMPyCQGKHu8g7IGOhOlgU7pFqMGcnRRVVpBgd
+3j6GaO7LbU0EwcB5z+E66E4fjqnMy/DgMxiCk5Idv7UP9ZGXQi9tu6Q5YY26WHLV
+HOqvhwG5X727qB1uBh6i
+=7JwX
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild
deleted file mode 100644 (file)
index 1b72a87..0000000
--- a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.3 2014/11/26 18:26:53 pesa Exp $
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Help module for the Qt toolkit"
-SRC_URI+="
-       compat? (
-               ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
-               http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
-       )"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-       KEYWORDS=""
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="compat doc"
-
-DEPEND="
-       ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-       ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-       ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
-       compat? (
-               ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-               >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-       tools/assistant/lib/fulltextsearch
-       tools/assistant/lib
-       tools/assistant/tools/qhelpgenerator
-       tools/assistant/tools/qcollectiongenerator
-       tools/assistant/tools/qhelpconverter
-       tools/qdoc3"
-
-pkg_setup() {
-       use compat && QT4_TARGET_DIRECTORIES+="
-               tools/assistant/compat
-               tools/assistant/compat/lib"
-}
-
-src_unpack() {
-       qt4-build-multilib_src_unpack
-
-       # compat version
-       # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
-       if use compat; then
-               mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
-               mv "${WORKDIR}"/QtAssistant "${S}"/include || die
-       fi
-}
-
-src_prepare() {
-       use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
-
-       qt4-build-multilib_src_prepare
-
-       # prevent rebuild of QtCore and QtXml (bug 348034)
-       sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-multilib_src_configure() {
-       local myconf=(
-               -system-libpng -system-libjpeg -system-zlib
-               -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-               -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-               -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-               -no-nas-sound -no-cups -no-nis -fontconfig
-       )
-       qt4_multilib_src_configure
-
-       if use compat; then
-               # syncqt knows nothing about these headers (bug 529398)
-               cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
-       fi
-}
-
-multilib_src_compile() {
-       qt4_multilib_src_compile
-
-       # release tarballs are shipped with prebuilt docs
-       if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
-               # qhelpgenerator needs libQtHelp.so.4
-               export LD_LIBRARY_PATH=${BUILD_DIR}/lib
-               export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
-               emake docs
-       fi
-}
-
-multilib_src_install() {
-       qt4_multilib_src_install
-
-       if multilib_is_native_abi; then
-               emake INSTALL_ROOT="${D}" install_qchdocs
-               use doc && emake INSTALL_ROOT="${D}" install_htmldocs
-
-               # do not compress .qch files
-               docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
-       fi
-}
-
-multilib_src_install_all() {
-       qt4_multilib_src_install_all
-
-       if use compat; then
-               insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
-               doins tools/assistant/compat/features/assistant.prf
-       fi
-}

diff --git a/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild
index dcab0e151d83c708c6d9574d6ee4ec89a0ee7206..cc857aaa17e3e7b8675a6c02348aaef168c4f40c 100644 (file)
--- a/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild,v 1.1 2015/01/25 18:20:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild,v 1.2 2015/01/26 02:49:28 pesa Exp $
 
 EAPI=5
 
@@ -58,7 +58,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       use compat && PATCHES+=("${FILESDIR}/${P}-fix-compat.patch")
+       use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch")
 
        qt4-build-multilib_src_prepare