diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-04-10 14:29:36 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-04-10 14:29:36 +0000 |
| commit | 20ba0a05af0c4b465bd54f9cf0f9834c5aa294d2 (patch) | |
| tree | b363dadc513b643048143dbf5a538c1cb3b129c8 /net-ftp | |
| parent | Fixed dependencies. Fixes bug 411277. (diff) | |
| download | gentoo-2-20ba0a05af0c4b465bd54f9cf0f9834c5aa294d2.tar.gz gentoo-2-20ba0a05af0c4b465bd54f9cf0f9834c5aa294d2.tar.bz2 gentoo-2-20ba0a05af0c4b465bd54f9cf0f9834c5aa294d2.zip | |
Respect CXXFLAGS, thanks to ago and kensington in bug 411445.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/qshare/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/qshare/metadata.xml | 3 | ||||
| -rw-r--r-- | net-ftp/qshare/qshare-2.1.2.ebuild | 10 | ||||
| -rw-r--r-- | net-ftp/qshare/qshare-2.1.3.ebuild | 8 |
4 files changed, 17 insertions, 10 deletions
diff --git a/net-ftp/qshare/ChangeLog b/net-ftp/qshare/ChangeLog index a312890db2f1..d957be36edc2 100644 --- a/net-ftp/qshare/ChangeLog +++ b/net-ftp/qshare/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/qshare # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.10 2012/04/05 22:57:34 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/ChangeLog,v 1.11 2012/04/10 14:29:36 pesa Exp $ + + 10 Apr 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml, + qshare-2.1.2.ebuild, qshare-2.1.3.ebuild: + Respect CXXFLAGS, thanks to ago and kensington in bug 411445. 05 Apr 2012; Jeff Horelick <jdhore@gentoo.org> qshare-2.1.2.ebuild: marked x86 per bug 410895 diff --git a/net-ftp/qshare/metadata.xml b/net-ftp/qshare/metadata.xml index 1d7818888617..dc439f7e84f5 100644 --- a/net-ftp/qshare/metadata.xml +++ b/net-ftp/qshare/metadata.xml @@ -2,7 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>qt</herd> -<longdescription lang="en"> -</longdescription> </pkgmetadata> - diff --git a/net-ftp/qshare/qshare-2.1.2.ebuild b/net-ftp/qshare/qshare-2.1.2.ebuild index dc56c24e0d16..fa0a20e82588 100644 --- a/net-ftp/qshare/qshare-2.1.2.ebuild +++ b/net-ftp/qshare/qshare-2.1.2.ebuild @@ -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-ftp/qshare/qshare-2.1.2.ebuild,v 1.2 2012/04/05 22:57:34 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.2.ebuild,v 1.3 2012/04/10 14:29:36 pesa Exp $ EAPI=4 @@ -8,7 +8,7 @@ LANGS="en es fr ru" inherit eutils qt4-r2 -DESCRIPTION="FTP server with a service discovery feature." +DESCRIPTION="FTP server with a service discovery feature" HOMEPAGE="http://www.zuzuf.net/qshare/" SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.gz" @@ -26,8 +26,12 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" src_prepare() { - sed -i "s:i18n:usr\/share\/${PN}\/translations:" src/config.cpp \ + sed -i -e "s:i18n:usr\/share\/${PN}\/translations:" src/config.cpp \ || die "failed to fix translations path" + + # Respect CXXFLAGS, bug 411445 + sed -i -e '/^QMAKE_CXXFLAGS_RELEASE/d' ${PN}.pro || die + qt4-r2_src_prepare } diff --git a/net-ftp/qshare/qshare-2.1.3.ebuild b/net-ftp/qshare/qshare-2.1.3.ebuild index 4497499bfb66..0f4253b60b60 100644 --- a/net-ftp/qshare/qshare-2.1.3.ebuild +++ b/net-ftp/qshare/qshare-2.1.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.3.ebuild,v 1.1 2012/03/22 15:57:17 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.3.ebuild,v 1.2 2012/04/10 14:29:36 pesa Exp $ EAPI=4 inherit eutils qt4-r2 -DESCRIPTION="FTP server with a service discovery feature." +DESCRIPTION="FTP server with a service discovery feature" HOMEPAGE="http://www.zuzuf.net/qshare/" SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.gz" @@ -24,7 +24,9 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" src_prepare() { - sed -i -e '/^QMAKE_CXXFLAGS_RELEASE/d' ${PN}.pro || die "sed failed" + # Respect CXXFLAGS, bug 411445 + sed -i -e '/^QMAKE_CXXFLAGS_RELEASE/d' ${PN}.pro || die + qt4-r2_src_prepare } |