Disable rss news on request (bug #302978). Drop old ebuild

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 982dd29d785481aa1393418c700f9c2c70d4075e..b44693f161aa8e8e3900bdf37ee3886c57be8a71 100644 (file)
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.44 2010/03/03 09:18:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.45 2010/03/07 12:30:31 hwoarang Exp $
+
+  07 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-creator-1.3.0.ebuild, qt-creator-1.3.1.ebuild:
+  Disable rss news on request (bug #302978). Drop old ebuild
 
   03 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
   qt-creator-1.3.0.ebuild:

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 585a6996d7cdd4eb93afd4e95e03183424faf10b..29403c151a05115f830f10531ffd501064dedfa3 100644 (file)
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,9 +1,7 @@
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
 DIST qt-creator-1.2.1-src.zip 8631249 RMD160 6aea12a39bd5827422afa6e02cfcad2174dc6582 SHA1 41d10717a83d3b7de7bc5218a35a38f25408a8d6 SHA256 9b955421050c1a9dacefa1ed888a971bffa86258a18598a1a1b297e5d8d23cbf
-DIST qt-creator-1.3.0-src.tar.gz 10613989 RMD160 d1c339dea74538a840317792b62b7a38ef10bcd0 SHA1 ccb1228411b9b7d5f3a734ee1a667b4a17ef0a26 SHA256 dd964ae6a9512904da94e681c461fbbfffd4505af33972e41b44b7f55ab846e1
 DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
 EBUILD qt-creator-1.2.1.ebuild 2894 RMD160 c2273fb5ecd97c45d0f90004aa41c298185730a9 SHA1 1ac8a0a953ff7802ea424ffc29b4315efeebce00 SHA256 f7b71ac5b08e649a48ef68647e922250060419b9866dc9b054c7c5dba600038b
-EBUILD qt-creator-1.3.0.ebuild 2807 RMD160 631c9ce75ac9488ef3edcf58ae4b212a6e9dbc82 SHA1 87f1bb58e608be59f2f8e927ded9c6792a5e39cf SHA256 183170cf75511800d05610726c8c38af97bae1864d22b7dda9343289a6db7a07
-EBUILD qt-creator-1.3.1.ebuild 3197 RMD160 390b286907bf27eedb56fbbd982669048f62b06c SHA1 1d3bc37dac2c4c7b53bda2a0ffcadc7742c6c1b8 SHA256 4e157cc167b931a8200f041cc261792d2a4d7154d2abbb9c7c3194e311c6277b
-MISC ChangeLog 6375 RMD160 a83fbf717501d7943d055ffc0dda6f685b28b152 SHA1 ee2a2c51fb6e338f0b0ba04323493376e927b00d SHA256 0e1fd3f8fc10bb965a6b4f9686cb5e196d306901cb7c06889188c5198ba1e944
+EBUILD qt-creator-1.3.1.ebuild 3448 RMD160 fafa00fd3f3be5b3404fb405c1b73d109b18cb20 SHA1 09ef842639a4d93ca23422f908112f0b7e6ea9ea SHA256 c8e40532c47f1d6a8581ddf8b4acc6b31bea870306b92d552ac1df728ce720f2
+MISC ChangeLog 6543 RMD160 9faf234b49c15bf79d90928481a1266dc0812bd3 SHA1 2856672aef09c8dee1f781a9bc6188e59c46938f SHA256 d845ca94f88b213b22e166d8372b3f03fdbd8d5098f1045b3a6832df8bfeaa37
 MISC metadata.xml 1033 RMD160 0b058403d52323334eb6b761f4fb2589d31d3bc3 SHA1 7d24c0b85f2db72266957079050bc6d220ed56c7 SHA256 4b4ace82370a5e11e600a2dad2e48361aba79b07cada8ef84389950aef58de3d

diff --git a/dev-util/qt-creator/qt-creator-1.3.0.ebuild b/dev-util/qt-creator/qt-creator-1.3.0.ebuild
deleted file mode 100644 (file)
index fa19c45..0000000
--- a/dev-util/qt-creator/qt-creator-1.3.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.0.ebuild,v 1.7 2010/03/06 12:53:27 djc Exp $
-
-EAPI="2"
-LANGS="de es fr it ja pl ru sl"
-
-inherit qt4-r2 multilib
-MY_PN="${PN/-/}"
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://labs.qtsoftware.com/page/Projects/Tools/QtCreator"
-SRC_URI="http://get.qt.nokia.com/${MY_PN}/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git kde mercurial perforce qtscript subversion"
-
-DEPEND=">=x11-libs/qt-assistant-4.6.0:4
-       >=x11-libs/qt-gui-4.6.0:4[dbus,qt3support]"
-
-RDEPEND="${DEPEND}
-       >=x11-libs/qt-sql-4.6.0:4
-       >=x11-libs/qt-svg-4.6.0:4
-       >=x11-libs/qt-test-4.6.0:4
-       >=x11-libs/qt-webkit-4.6.0:4
-       !kde? ( || ( >=x11-libs/qt-phonon-4.6.0:4 media-sound/phonon ) )
-       kde? ( media-sound/phonon )
-       cmake? ( dev-util/cmake )
-       cvs? ( dev-util/cvs )
-       sys-devel/gdb
-       examples? ( >=x11-libs/qt-demo-4.6.0:4 )
-       git? ( dev-util/git )
-       mercurial? ( dev-vcs/mercurial )
-       qtscript? ( >=x11-libs/qt-script-4.6.0:4 )
-       subversion? ( dev-util/subversion )"
-
-PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qtscript subversion"
-
-src_prepare() {
-       qt4_src_prepare
-
-       # bug 263087
-       for plugin in ${PLUGINS};do
-               if ! use ${plugin};then
-                       einfo "Disabling ${plugin} support"
-                       if [[ ${plugin} == "cmake" ]];then
-                               plugin="cmakeprojectmanager"
-                       elif [[ ${plugin} == "qtscript" ]];then
-                               plugin="qtscripteditor"
-                       fi
-                       sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
-                               || die "Failed to disable ${plugin} plugin"
-               fi
-       done
-
-       if use perforce;then
-               ewarn
-               ewarn "You have enabled perforce plugin."
-               ewarn "In order to use it, you need to manually"
-               ewarn "download perforce client from http://www.perforce.com/perforce/downloads/index.html"
-               ewarn
-               ebeep 5
-       fi
-}
-
-src_configure() {
-       eqmake4 ${MY_PN}.pro IDE_LIBRARY_BASENAME="$(get_libdir)"
-}
-
-src_install() {
-       emake INSTALL_ROOT="${D}/usr" install_subtargets || die "emake install failed"
-       # fix binary name bug 275859
-       mv "${D}"/usr/bin/${MY_PN}.bin "${D}"/usr/bin/${MY_PN} || die "failed to rename executable"
-       if use doc;then
-               emake INSTALL_ROOT="${D}/usr" install_qch_docs || die "emake install qch_docs failed"
-       fi
-       make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
-               'Qt;Development;IDE' || die "make_desktop_entry failed"
-
-       # install translations
-       insinto /usr/share/${MY_PN}/translations/
-       for x in ${LINGUAS};do
-               for lang in ${LANGS};do
-                       if [[ ${x} == ${lang} ]];then
-                               doins share/${MY_PN}/translations/${MY_PN}_${x}.qm \
-                                       || die "failed to install translations"
-                       fi
-               done
-       done
-}

diff --git a/dev-util/qt-creator/qt-creator-1.3.1.ebuild b/dev-util/qt-creator/qt-creator-1.3.1.ebuild
index d81f7eb26a77bbdde5b8b2359ec3a2b9a603b3fd..474dbd0ee9b35ebe6b7614dcaaf71fed72ad2b3c 100644 (file)
--- a/dev-util/qt-creator/qt-creator-1.3.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1.ebuild,v 1.7 2010/03/06 12:53:27 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1.ebuild,v 1.8 2010/03/07 12:30:31 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -15,7 +15,8 @@ SRC_URI="http://get.qt.nokia.com/${MY_PN}/${P}-src.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git kde mercurial perforce qml qtscript subversion"
+IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
+kde mercurial perforce qml qtscript rss subversion"
 
 DEPEND=">=x11-libs/qt-assistant-4.6.0:4
        >=x11-libs/qt-gui-4.6.0:4[dbus,qt3support]"
@@ -72,6 +73,13 @@ src_prepare() {
                ewarn
                ebeep 5
        fi
+       # disable rss news on startup ( bug #302978 )
+       if ! use rss; then
+               einfo "Disabling RSS welcome news"
+               sed -i "/m_rssFetcher->fetch/s:^:\/\/:" \
+                       src/plugins/welcome/communitywelcomepagewidget.cpp \
+                       || die "failed to disable rss"
+       fi
 }
 
 src_configure() {