* [gentoo-commits] gentoo-x86 commit in net-p2p/transmission: transmission-2.50-r1.ebuild transmission-9999.ebuild
@ 2012-03-02 10:53 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-02 10:53 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/03/02 10:53:17
Modified: transmission-2.50-r1.ebuild
transmission-9999.ebuild
Log:
Fix Qt4 icon install, misc
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Revision Changes Path
1.3 net-p2p/transmission/transmission-2.50-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?r1=1.2&r2=1.3
Index: transmission-2.50-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- transmission-2.50-r1.ebuild 2 Mar 2012 09:30:04 -0000 1.2
+++ transmission-2.50-r1.ebuild 2 Mar 2012 10:53:17 -0000 1.3
@@ -1,18 +1,27 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.2 2012/03/02 09:30:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.3 2012/03/02 10:53:17 ssuominen Exp $
EAPI=4
LANGS="en es kk lt pt_BR ru"
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+ ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
+ _live_inherits=subversion
+else
+ SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
DESCRIPTION="A Fast, Easy and Free BitTorrent client"
HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="ayatana gtk lightweight nls qt4 xfs"
RDEPEND="
@@ -56,8 +65,21 @@
enewuser ${PN} -1 -1 -1 ${PN}
}
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ subversion_src_unpack
+ else
+ default
+ fi
+}
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-build-with-natpmp1.patch #376647
+ if [[ ${PV} == *9999* ]]; then
+ subversion_src_prepare
+ ./update-version-h.sh
+ fi
+
+ epatch "${FILESDIR}"/${PN}-2.50-build-with-natpmp1.patch #376647
sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac
use ayatana || sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac
@@ -66,6 +88,7 @@
sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
eautoreconf
+ intltoolize --copy --force --automake || die
if use qt4; then
cat <<-EOF > "${T}"/${PN}-magnet.protocol
@@ -134,7 +157,12 @@
emake INSTALL_ROOT="${D}"/usr install
domenu ${PN}-qt.desktop
- doicon icons/${PN}-qt.png
+
+ local res
+ for res in 16 22 24 32 48; do
+ insinto /usr/share/icons/hicolor/${res}x${res}/apps
+ newins icons/hicolor_apps_${res}x${res}_transmission.png ${PN}-qt.png
+ done
insinto /usr/share/kde4/services
doins "${T}"/${PN}-magnet.protocol
1.2 net-p2p/transmission/transmission-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?r1=1.1&r2=1.2
Index: transmission-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transmission-9999.ebuild 2 Mar 2012 10:28:38 -0000 1.1
+++ transmission-9999.ebuild 2 Mar 2012 10:53:17 -0000 1.2
@@ -1,19 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.1 2012/03/02 10:28:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.2 2012/03/02 10:53:17 ssuominen Exp $
EAPI=4
LANGS="en es kk lt pt_BR ru"
+unset _live_inherits
+
if [[ ${PV} == *9999* ]]; then
ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
- inherit subversion
+ _live_inherits=subversion
else
SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
DESCRIPTION="A Fast, Easy and Free BitTorrent client"
HOMEPAGE="http://www.transmissionbt.com/"
@@ -64,7 +66,11 @@
}
src_unpack() {
- [[ ${PV} == *9999* ]] && subversion_src_unpack
+ if [[ ${PV} == *9999* ]]; then
+ subversion_src_unpack
+ else
+ default
+ fi
}
src_prepare() {
@@ -151,7 +157,12 @@
emake INSTALL_ROOT="${D}"/usr install
domenu ${PN}-qt.desktop
- doicon icons/${PN}-qt.png
+
+ local res
+ for res in 16 22 24 32 48; do
+ insinto /usr/share/icons/hicolor/${res}x${res}/apps
+ newins icons/hicolor_apps_${res}x${res}_transmission.png ${PN}-qt.png
+ done
insinto /usr/share/kde4/services
doins "${T}"/${PN}-magnet.protocol
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-p2p/transmission: transmission-2.50-r1.ebuild transmission-9999.ebuild
@ 2012-03-02 10:56 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-02 10:56 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/03/02 10:56:14
Modified: transmission-2.50-r1.ebuild
transmission-9999.ebuild
Log:
tidy
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Revision Changes Path
1.4 net-p2p/transmission/transmission-2.50-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild?r1=1.3&r2=1.4
Index: transmission-2.50-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transmission-2.50-r1.ebuild 2 Mar 2012 10:53:17 -0000 1.3
+++ transmission-2.50-r1.ebuild 2 Mar 2012 10:56:14 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.3 2012/03/02 10:53:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.4 2012/03/02 10:56:14 ssuominen Exp $
EAPI=4
LANGS="en es kk lt pt_BR ru"
@@ -161,7 +161,7 @@
local res
for res in 16 22 24 32 48; do
insinto /usr/share/icons/hicolor/${res}x${res}/apps
- newins icons/hicolor_apps_${res}x${res}_transmission.png ${PN}-qt.png
+ newins icons/hicolor_apps_${res}x${res}_${PN}.png ${PN}-qt.png
done
insinto /usr/share/kde4/services
1.3 net-p2p/transmission/transmission-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild?r1=1.2&r2=1.3
Index: transmission-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- transmission-9999.ebuild 2 Mar 2012 10:53:17 -0000 1.2
+++ transmission-9999.ebuild 2 Mar 2012 10:56:14 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.2 2012/03/02 10:53:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.3 2012/03/02 10:56:14 ssuominen Exp $
EAPI=4
LANGS="en es kk lt pt_BR ru"
@@ -161,7 +161,7 @@
local res
for res in 16 22 24 32 48; do
insinto /usr/share/icons/hicolor/${res}x${res}/apps
- newins icons/hicolor_apps_${res}x${res}_transmission.png ${PN}-qt.png
+ newins icons/hicolor_apps_${res}x${res}_${PN}.png ${PN}-qt.png
done
insinto /usr/share/kde4/services
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-02 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-02 10:56 [gentoo-commits] gentoo-x86 commit in net-p2p/transmission: transmission-2.50-r1.ebuild transmission-9999.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2012-03-02 10:53 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox