summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-04-10 14:29:36 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-04-10 14:29:36 +0000
commite2e686425a4e1613cfa8886f67e16998b04d37c3 (patch)
treea8ded70787644695296b3b21e71993512d448f56 /net-ftp
parentFixed dependencies. Fixes bug 411277. (diff)
downloadhistorical-e2e686425a4e1613cfa8886f67e16998b04d37c3.tar.gz
historical-e2e686425a4e1613cfa8886f67e16998b04d37c3.tar.bz2
historical-e2e686425a4e1613cfa8886f67e16998b04d37c3.zip
Respect CXXFLAGS, thanks to ago and kensington in bug 411445.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/qshare/ChangeLog6
-rw-r--r--net-ftp/qshare/Manifest28
-rw-r--r--net-ftp/qshare/metadata.xml3
-rw-r--r--net-ftp/qshare/qshare-2.1.2.ebuild10
-rw-r--r--net-ftp/qshare/qshare-2.1.3.ebuild8
5 files changed, 41 insertions, 14 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/Manifest b/net-ftp/qshare/Manifest
index 8a8aa7d0a07a..036607e764f8 100644
--- a/net-ftp/qshare/Manifest
+++ b/net-ftp/qshare/Manifest
@@ -1,8 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
DIST 116612-qshare-1.3-src.tar.gz 436579 RMD160 4001d66c03e9f8e3848d7dfb7241fd6d78a36536 SHA1 73423fe7f08adf8d95b5df539ca8295d2faa4c8d SHA256 c9bda598b3cdc58c23ee61196582bc6727fbef34b04792f8c5839769e169791d
DIST qshare-2.1.2-src.tar.gz 452915 RMD160 5a86a5a339295498cc541ecf5c26706479581b3e SHA1 2ae8c3412bd40198e63c015b8a4f9d85bb4f40b1 SHA256 3cbbe2d4dc008ed69e858abc6c5eb30b36e71db78fb51e6c9a87debf933931c5
DIST qshare-2.1.3-src.tar.gz 538705 RMD160 5cfef7eeed4f067e6b5fd91e10b4612ba76f6610 SHA1 53add4b58b37d2e0c171ae7a82103a99410e65ba SHA256 1895900f4a9209049963cae9dd4b956974de8f29a1ef1285a06d0348fe61480c
EBUILD qshare-1.3.ebuild 1132 RMD160 74648edbc8ce1501d2f910328c797690e58720c9 SHA1 5019e8be8f9c215ac23c9189cb1d6d9b2809a039 SHA256 add321bb97665b22e26a9467cdbd01e2272a1edc12213ae3d59147f62ba34e2a
-EBUILD qshare-2.1.2.ebuild 1121 RMD160 f9656e690ac1a3582bdd6d94859ba5876c13c881 SHA1 2c9282134abe748bccd19bbf33a8ce9bdfbc5e87 SHA256 f933d55748de66c71bf763acaecaf719cc9fe43794ace83bde4cb1d2e406571b
-EBUILD qshare-2.1.3.ebuild 873 RMD160 d663c5a1688ecfefc56e4c8e15c9c6eef83befa8 SHA1 55c21b5370b3a0edfd5c00ee341db684392dbdb2 SHA256 2ac9a548cc75539f972fb8586b027a505fe7f2bb5cf41779c0ea042124b69e2a
-MISC ChangeLog 1553 RMD160 cef1d98abaf220fe9e158e23ea3ac5b8ae681842 SHA1 041fba15164f823c01d24a763114ced23ab2ffb7 SHA256 83e270664157e3931cdd60aaf8a0d4ae34628525b4a1572566bbcfb28618cb06
-MISC metadata.xml 203 RMD160 f21ab0adb7ed966ccbfb8706172574746bf83c45 SHA1 9929f57d84969eaa6e4f2b8d399921bc4c7ba1e4 SHA256 e70e3acb51ca19e8ef1c7b3fe1356e152781028e0bdccd400e0979db61b77070
+EBUILD qshare-2.1.2.ebuild 1212 RMD160 06e2f6f164bd99c1b5967bb6d71ce782bd8ba3fc SHA1 106b485c4cb531fdf1cf27d633061ec278b8eb39 SHA256 b31c583e1ffd8cb975f26e225259df5c9e6f137c2d4ad82696ec1308c08ae701
+EBUILD qshare-2.1.3.ebuild 892 RMD160 7b9a34a101063d83414ca598411148ab9b8fe9d2 SHA1 9566d71de0eb610e28bc58a800ab2ee68f262bcd SHA256 542dbfd32741dbdd33a0270e70188c6c2e8b2dda5c6f94ed3a4dbd1ac880db0c
+MISC ChangeLog 1724 RMD160 a6e8332519e3ec09556afedae14ce419ec1bab92 SHA1 27fa9058f2f97c5a8c708d6d20317ee128a6a02b SHA256 7ec8496fefe7cff182e0d1e6dddedf0f59a1bfa1174106ee8518e4b3f92a195a
+MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPhEPjAAoJENXLsxwXqFxyWlwQAIKEowtqDZveMHkCcgbKrWLL
+ahtMxUQzqXuza9mj40MSaUdbTyRs4+tH7Zu44B6cUC/FXSS+7me187nX65bndwgW
+4ydcAl1oJRwlDHpShtM7HVHUE5qAFBrQoc6pT/wSORsn5zAzHAHDtV+v0V1dvctO
+kr0SYPZ45Wl09OSDYowJ8iDWyFEttt1P5CJB0sVndEXqi3WEisJCLrdqmE0pGATz
+qIq5+cJZ56KWbdzub4ZLdLv+gcRf+VLf31X9Hr1E3PswtC31r5Sd1+l7QCHyrSDk
+dC4Do2fwtSoY+cqSVxZWdsafE0xI7vbY1/Kr8KcYhxXp1XPSomuwXYIVxhbYp9LF
+qanguGyC4LLKjH17UrnBph2MP4goCoPQcIa09S6n6SEPW63hkpQLU+wa9QnOez/I
+DVy1cn5fiHuGK7q+VsFndMAHQaG4CB9qaIlBmx6b5a/WBcOxzbya60OT0ZeYW8Xb
+2UuTOqxqRizGkpnD2tVI3CH9NyDmWf+u4YpQp9dYH6rP2LOWkvyc7tvsLkLsZhTX
+c+v4MmRHW1zA0Rt0FRf7I0GDXacaOvU23yBP5fSAMNP5uExi6EsUuuGkhg7TuZw+
+COri8LZtP7tXq0pxu8m3HzA/DlkOS1dHnqM8zaY8MXw45FE0M8I7F4rVXPzvhzXS
+mj+xlROtZvJCLodxHTam
+=88In
+-----END PGP SIGNATURE-----
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
}