From 6318e8da8dae9af873482c34366049430ba4721f Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Fri, 15 Oct 2010 11:23:56 +0000 Subject: Depend qt-dbus, fixes build issue reported in bug #338059 by Robert Wolf. Drop old. (Portage version: 2.1.9.18/cvs/Linux x86_64) --- net-p2p/transmission/ChangeLog | 8 +- net-p2p/transmission/transmission-1.93.ebuild | 115 ----------------------- net-p2p/transmission/transmission-2.01.ebuild | 90 ------------------ net-p2p/transmission/transmission-2.03.ebuild | 90 ------------------ net-p2p/transmission/transmission-2.04-r1.ebuild | 4 +- net-p2p/transmission/transmission-2.04.ebuild | 90 ------------------ 6 files changed, 9 insertions(+), 388 deletions(-) delete mode 100644 net-p2p/transmission/transmission-1.93.ebuild delete mode 100644 net-p2p/transmission/transmission-2.01.ebuild delete mode 100644 net-p2p/transmission/transmission-2.03.ebuild delete mode 100644 net-p2p/transmission/transmission-2.04.ebuild (limited to 'net-p2p') diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog index 6146e284bb4f..9cd97e76e9f9 100644 --- a/net-p2p/transmission/ChangeLog +++ b/net-p2p/transmission/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/transmission # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.126 2010/10/06 19:50:53 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.127 2010/10/15 11:23:56 pva Exp $ + + 15 Oct 2010; Peter Volkov -transmission-1.93.ebuild, + -transmission-2.01.ebuild, -transmission-2.03.ebuild, + -transmission-2.04.ebuild, transmission-2.04-r1.ebuild: + Depend qt-dbus, fixes build issue reported in bug #338059 by Robert Wolf. + Drop old. 06 Oct 2010; Markus Meier transmission-2.04-r1.ebuild: x86 stable, bug #338059 diff --git a/net-p2p/transmission/transmission-1.93.ebuild b/net-p2p/transmission/transmission-1.93.ebuild deleted file mode 100644 index 62ee38670812..000000000000 --- a/net-p2p/transmission/transmission-1.93.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-1.93.ebuild,v 1.1 2010/05/18 09:26:34 pva Exp $ - -EAPI=2 -inherit autotools eutils fdo-mime gnome2-utils qt4-r2 - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-1.4.11 - =dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.15.5:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - gnome? ( >=gnome-base/gconf-2.20.0 ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - sed -i \ - -e 's:-g -O0::g' \ - -e 's:-g -O3::g' \ - -e 's:-ggdb3::g' \ - configure.ac || die - - sed -i \ - -e 's:$${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a:-levent:' \ - qt/qtr.pro || die - - eautoreconf -} - -src_configure() { - local myconf="--disable-libnotify --disable-libcanberra --disable-libgconf" - - if use gtk; then - myconf="$(use_enable libnotify) - $(use_enable sound libcanberra) - $(use_enable gnome libgconf)" - fi - - # cli and daemon doesn't have external deps - econf \ - --disable-dependency-tracking \ - $(use_enable gtk) \ - --enable-cli \ - --enable-daemon \ - ${myconf} - - if use qt4; then - cd qt - eqmake4 qtr.pro - fi -} - -src_compile() { - emake || die - - if use qt4; then - cd qt - emake || die - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${D}"/usr/share/${PN}/web/LICENSE - - # these are likely outdated for 1.83 - newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon || die - newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon || die - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || doicon qt/icons/transmission.png - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.01.ebuild b/net-p2p/transmission/transmission-2.01.ebuild deleted file mode 100644 index c6c76befca11..000000000000 --- a/net-p2p/transmission/transmission-2.01.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.01.ebuild,v 1.2 2010/07/04 13:42:46 ssuominen Exp $ - -EAPI=2 -inherit eutils fdo-mime gnome2-utils qt4-r2 - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-1.4.11 - =dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.15.5:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - gnome? ( >=gnome-base/gconf-2.20.0 ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - sed -i -e 's:-ggdb3::g' configure || die -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - --disable-dependency-tracking \ - $(use_enable gtk) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable sound libcanberra) \ - $(use gtk && use_enable gnome gconf2) - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake || die - use qt4 && cd qt && { emake || die; } -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${D}"/usr/share/${PN}/web/LICENSE - - # these are likely outdated for 1.83 - newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon || die - newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon || die - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || doicon qt/icons/transmission.png - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.03.ebuild b/net-p2p/transmission/transmission-2.03.ebuild deleted file mode 100644 index eb3e7e4d77da..000000000000 --- a/net-p2p/transmission/transmission-2.03.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.03.ebuild,v 1.1 2010/07/22 14:20:07 pva Exp $ - -EAPI=2 -inherit eutils fdo-mime gnome2-utils qt4-r2 - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-1.4.11 - =dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.15.5:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - gnome? ( >=gnome-base/gconf-2.20.0 ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - sed -i -e 's:-ggdb3::g' configure || die -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - --disable-dependency-tracking \ - $(use_enable gtk) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable sound libcanberra) \ - $(use gtk && use_enable gnome gconf2) - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake || die - use qt4 && cd qt && { emake || die; } -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${D}"/usr/share/${PN}/web/LICENSE - - # these are likely outdated for 1.83 - newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon || die - newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon || die - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || doicon qt/icons/transmission.png - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.04-r1.ebuild b/net-p2p/transmission/transmission-2.04-r1.ebuild index 541147877476..ef1e8b550381 100644 --- a/net-p2p/transmission/transmission-2.04-r1.ebuild +++ b/net-p2p/transmission/transmission-2.04-r1.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/net-p2p/transmission/transmission-2.04-r1.ebuild,v 1.3 2010/10/06 19:50:53 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.04-r1.ebuild,v 1.4 2010/10/15 11:23:56 pva Exp $ EAPI=2 inherit eutils fdo-mime gnome2-utils qt4-r2 @@ -27,7 +27,7 @@ RDEPEND=" gnome? ( >=gnome-base/gconf-2.20.0 ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" + qt4? ( x11-libs/qt-gui:4[dbus] )" DEPEND="${RDEPEND} >=sys-devel/libtool-2.2.6b sys-devel/gettext diff --git a/net-p2p/transmission/transmission-2.04.ebuild b/net-p2p/transmission/transmission-2.04.ebuild deleted file mode 100644 index 7d190c864543..000000000000 --- a/net-p2p/transmission/transmission-2.04.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.04.ebuild,v 1.1 2010/08/13 07:31:45 pva Exp $ - -EAPI=2 -inherit eutils fdo-mime gnome2-utils qt4-r2 - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-1.4.11 - =dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.15.5:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - gnome? ( >=gnome-base/gconf-2.20.0 ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - sed -i -e 's:-ggdb3::g' configure || die -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - --disable-dependency-tracking \ - $(use_enable gtk) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable sound libcanberra) \ - $(use gtk && use_enable gnome gconf2) - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake || die - use qt4 && cd qt && { emake || die; } -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${D}"/usr/share/${PN}/web/LICENSE - - # these are likely outdated for 1.83 - newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon || die - newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon || die - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || doicon qt/icons/transmission.png - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad