diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/psi/ChangeLog | 10 | ||||
| -rw-r--r-- | net-im/psi/Manifest | 11 | ||||
| -rw-r--r-- | net-im/psi/files/psi-0.14-drop-debug-cflags.patch | 35 | ||||
| -rw-r--r-- | net-im/psi/psi-0.14-r4.ebuild | 41 |
4 files changed, 71 insertions, 26 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 14802e3d8b48..7a3a640c4a12 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/psi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.215 2011/10/19 11:34:51 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.216 2011/10/19 13:28:51 pva Exp $ + + 19 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild, + +files/psi-0.14-drop-debug-cflags.patch: + Don't pass -g to C.*FLAGS and bump EAPI, thank Agostino Sarubbo for this job. + + 19 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild, + +files/psi-0.14-drop-debug-cflags.patch: + Don't pass -g to C.*FLAGS, thank Agostino Sarubbo for the fix. *psi-0.14-r4 (19 Oct 2011) diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index cb71288d749f..99c3ae93a97a 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX psi-0.14-drop-debug-cflags.patch 1098 RMD160 519c2c7dfc4e72ac1e3fe910f9663a9d3bc9f2fe SHA1 f4c88403c01b670d763878538d58bd54d6bccdd0 SHA256 ca7878131af3697275fe7b83ffdbd89886ba6cea27a38aff495b0eb60c5ca5e6 AUX psi-0.14-input-validation.patch 7440 RMD160 74d1fdcacd3481fcebae9107ba4b185946a2bb82 SHA1 8eb19e4e5b86f59e8adf5d5b98464017d811120d SHA256 4f8f52b6846b238586d8584d8ca5a62b56bd5bfad328765eb157dc95c83bf017 AUX psi-0.14-minizip-detection.patch 6539 RMD160 4fa6e4991e338ee8a69c766675798655e7827153 SHA1 4052c6f01380a5fcf0879266b76e0bfaeae9d33a SHA256 04ac9f7b908c60a1288e1446625038a45637fabf387848cd135f20a4b71529c3 AUX psi-0.14-qt-compat.patch 1492 RMD160 eafdbe9391496bfd2198eaf6aa0637b569331c4a SHA1 5639a2078b1cbe318a4ba7d930fead6101766b59 SHA256 1af6ebbe01094519fcdbbe442a3c5798d499da134a08787648e71783e7b0ba60 @@ -10,14 +11,14 @@ DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 EBUILD psi-0.14-r1.ebuild 4668 RMD160 7e3aed2859dc2880471640af3a1c6296df848889 SHA1 37c58876124c1696b1111d8c11ee140ba93ee86d SHA256 7e7bf643317bc775d0e0e9d747e307edd6cba96a8f2a1162e62565fd383334bb EBUILD psi-0.14-r2.ebuild 4767 RMD160 8577968b92ca9e9c23222b2caaa8b70c86b41ce4 SHA1 4282e29358296d6f44e99d1fb88618dc107a82e9 SHA256 0933ae51870de2849f0b3543c1826a7784016ed40d21fd3e46db4a192f4c235b -EBUILD psi-0.14-r4.ebuild 4828 RMD160 c8a83b138488547426834522dd339a24085ff134 SHA1 6d54107c3a7aabd2c1f7655b133fe62b7440ca5c SHA256 e408f6ef457f13baf8a1a7217e60066b3dfd7fbc58551d40ff4df1dba192b531 +EBUILD psi-0.14-r4.ebuild 4761 RMD160 225f29bc51a873f435acfecde2f455ff17e51899 SHA1 1fb05279e66dd153d93bf5edf34e8b10eba0682a SHA256 ce5d17d5702b06b5943691ab5c8cda572a7c66549509ce06e6fd37b8dcb0ad7d EBUILD psi-9999.ebuild 6274 RMD160 4990e95378f6436e54381205ada5a12c7cb5a028 SHA1 f585c22d9434ea63cb6e2355f736a0ab5dcfd175 SHA256 ce57eabc0adf28ef23d2cf77b2e0c6efa8fb9ffe84a97918611954e561cdfedd -MISC ChangeLog 31745 RMD160 475a04c0aab25551c765ba1b9af0096160dd4242 SHA1 5ccc0ba74d9af603b2af8af94df05ebfc6677e81 SHA256 85389a336defe0761c55fa94df16182897853c5ca2f9fff443d12faae6e935b2 +MISC ChangeLog 32108 RMD160 193985f0824d87f5caf4663e4cadf13b289aca6b SHA1 f1512d45d42b889a5a17bcd198f77bcb62e95f01 SHA256 77a15e770baaac1754700182edd21b76d5c7e5ca499422b50ff5329266739596 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6etW8ACgkQGrk+8vGYmwcWCQEAnYVcyJUWDWrFo7+3julsYpWX -VkNbBnyI21IHUSsFYhYBAKAy0HtNZgcC/yvQKOyUptW5ridd3emEduKdMvLFn8UH -=q8AR +iF4EAREIAAYFAk6e0CcACgkQGrk+8vGYmwe5fwD9HiXS52Xm0o9zwV2K1GZtOvR7 +UuMLAqIJUEK8+aKU2SsA/2cZ3Hn0FyojjvifA1VAHdBnwIyIDGNnZW11r7UJCOXg +=Mnuo -----END PGP SIGNATURE----- diff --git a/net-im/psi/files/psi-0.14-drop-debug-cflags.patch b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch new file mode 100644 index 000000000000..227265696ae6 --- /dev/null +++ b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch @@ -0,0 +1,35 @@ +Drop -g from CFLAGS + +--- qcm/buildmodeapp.qcm 2011-10-19 14:38:55.621699641 +0200 ++++ qcm/buildmodeapp.qcm 2011-10-19 14:39:11.868700486 +0200 +@@ -130,8 +130,6 @@ + if(qc_buildmode_separate_debug_info) + { + opts += "separate_debug_info"; +- other += "*-g++*:QMAKE_CFLAGS += -g\n"; +- other += "*-g++*:QMAKE_CXXFLAGS += -g\n"; + } + + QString str = QString("CONFIG += ") + opts.join(" ") + '\n'; +--- iris/qcm/extra.qcm.old 2011-10-19 14:39:40.268701738 +0200 ++++ iris/qcm/extra.qcm 2011-10-19 14:40:01.904699887 +0200 +@@ -55,8 +55,6 @@ + if(debug_info) + { + str += QString("CONFIG += separate_debug_info\n"); +- str += "QMAKE_CFLAGS += -g\n"; +- str += "QMAKE_CXXFLAGS += -g\n"; + } + if(universal) + { +--- iris/qcm/buildmode.qcm.old 2011-10-19 14:40:23.794701147 +0200 ++++ iris/qcm/buildmode.qcm 2011-10-19 14:40:42.157701302 +0200 +@@ -186,8 +186,6 @@ + if(qc_buildmode_separate_debug_info) + { + opts += "separate_debug_info"; +- other += "QMAKE_CFLAGS += -g\n"; +- other += "QMAKE_CXXFLAGS += -g\n"; + } + + QString str = QString("CONFIG += ") + opts.join(" ") + '\n'; diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild index 908dc5ff18df..74e5132c20ce 100644 --- a/net-im/psi/psi-0.14-r4.ebuild +++ b/net-im/psi/psi-0.14-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.1 2011/10/19 11:34:51 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.2 2011/10/19 13:28:51 pva Exp $ -EAPI="2" +EAPI=4 inherit eutils qt4-r2 multilib @@ -53,6 +53,7 @@ src_prepare() { epatch "${FILESDIR}/psi-0.14-qt-compat.patch" epatch "${FILESDIR}/psi-0.14-minizip-detection.patch" epatch "${FILESDIR}/psi-0.14-input-validation.patch" + epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch" if use extras; then # some patches from psi+ project http://code.google.com/p/psi-dev @@ -84,7 +85,7 @@ src_prepare() { fi fi - rm -rf third-party/qca # We use system libraries. + rm -rf third-party/qca || die # We use system libraries. } src_configure() { @@ -111,38 +112,38 @@ src_configure() { src_compile() { eqmake4 - emake || die "emake failed" + emake if use doc; then - cd doc - mkdir -p api # 259632 - make api_public || die "make api_public failed" + cd doc || die + mkdir -p api || die # 259632 + emake api_public fi } src_install() { - emake INSTALL_ROOT="${D}" install || die "emake install failed" - rm "${D}"/usr/share/psi/{COPYING,README} + emake INSTALL_ROOT="${D}" install + rm "${D}"/usr/share/psi/{COPYING,README} || die # this way the docs will be installed in the standard gentoo dir - newdoc iconsets/roster/README README.roster || die - newdoc iconsets/system/README README.system || die - newdoc certs/README README.certs || die - dodoc README || die + newdoc iconsets/roster/README README.roster + newdoc iconsets/system/README README.system + newdoc certs/README README.certs + dodoc README if use doc; then - cd doc - dohtml -r api || die "dohtml failed" + cd doc || die + dohtml -r api fi # install translations - cd "${WORKDIR}" + cd "${WORKDIR}" || die insinto /usr/share/${PN}/ local nolangs=true for LNG in ${LANGS}; do if use linguas_${LNG}; then - doins ${LNG}/${PN}_${LNG}.qm || die - newins ${LNG}/INFO INFO.${LNG} || die + doins ${LNG}/${PN}_${LNG}.qm + newins ${LNG}/INFO INFO.${LNG} nolangs=false fi done @@ -150,8 +151,8 @@ src_install() { # if linguas is empty install all translations if ${nolangs}; then for LNG in ${LANGS}; do - doins ${LNG}/${PN}_${LNG}.qm || die - newins ${LNG}/INFO INFO.${LNG} || die + doins ${LNG}/${PN}_${LNG}.qm + newins ${LNG}/INFO INFO.${LNG} done fi |