Fix building on Gentoo/FreeBSD and add ~x86-fbsd keyword.

Package-Manager: portage-2.1.2_pre1

3 files changed, 21 insertions, 16 deletions

diff --git a/dev-util/bouml/ChangeLog b/dev-util/bouml/ChangeLog
index 4a8f5c9ec887..ea5423f8df74 100644
--- a/dev-util/bouml/ChangeLog
+++ b/dev-util/bouml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/bouml
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/ChangeLog,v 1.3 2006/09/18 11:27:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/ChangeLog,v 1.4 2006/09/18 19:58:26 flameeyes Exp $
+
+  18 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> bouml-2.17.ebuild:
+  Fix building on Gentoo/FreeBSD and add ~x86-fbsd keyword.
 
 *bouml-2.17 (18 Sep 2006)
 
diff --git a/dev-util/bouml/Manifest b/dev-util/bouml/Manifest
index f2aae1dba00c..e0d6ab80256f 100644
--- a/dev-util/bouml/Manifest
+++ b/dev-util/bouml/Manifest
@@ -7,14 +7,14 @@ EBUILD bouml-2.16.ebuild 1458 RMD160 63ea32665138dc2fe445cbe106006d9b9b96131f SH
 MD5 54168add75c90b846fe0e510cdd18642 bouml-2.16.ebuild 1458
 RMD160 63ea32665138dc2fe445cbe106006d9b9b96131f bouml-2.16.ebuild 1458
 SHA256 60c23e87c369fc0691ac2408aa1c3c58cb4b6cd60b411b098968acad4b7d7e01 bouml-2.16.ebuild 1458
-EBUILD bouml-2.17.ebuild 1462 RMD160 42f3260b705ad66e9aa5f582531b4a8a58ecad52 SHA1 005b535af9abe80ae0c4c21a5782d497ea48b95c SHA256 f8c793ffbd2fdefbea7adeee0a4f648ccb37b3d726e2fbde33519662406e74e2
-MD5 5d7ab2fe63975f4345d1a534b4f20a73 bouml-2.17.ebuild 1462
-RMD160 42f3260b705ad66e9aa5f582531b4a8a58ecad52 bouml-2.17.ebuild 1462
-SHA256 f8c793ffbd2fdefbea7adeee0a4f648ccb37b3d726e2fbde33519662406e74e2 bouml-2.17.ebuild 1462
-MISC ChangeLog 734 RMD160 018724a8b3d318df4ce9140b563a52e0d877ef86 SHA1 062439eb4657da98bcacec2ab3c5a8d928f0d99d SHA256 def0b6e76db1ba959707977cd4f289703b96e32050f96cd65e22f28d17901c8e
-MD5 67618fc32a729153bdf5d8ebd1a81589 ChangeLog 734
-RMD160 018724a8b3d318df4ce9140b563a52e0d877ef86 ChangeLog 734
-SHA256 def0b6e76db1ba959707977cd4f289703b96e32050f96cd65e22f28d17901c8e ChangeLog 734
+EBUILD bouml-2.17.ebuild 1547 RMD160 b08b987db3997e93b82f8b42fafd0f8c2634d920 SHA1 d4d3897224dc0a712079b96921424e39df07132c SHA256 7985fe304332844b0b9d6aa9f52def5e6c6976a8d94301e49c021e062fbab84b
+MD5 48007f07df73d3f3ec14b15bdbb786fa bouml-2.17.ebuild 1547
+RMD160 b08b987db3997e93b82f8b42fafd0f8c2634d920 bouml-2.17.ebuild 1547
+SHA256 7985fe304332844b0b9d6aa9f52def5e6c6976a8d94301e49c021e062fbab84b bouml-2.17.ebuild 1547
+MISC ChangeLog 867 RMD160 bb6d11827738c14322f60be65a407ea5b1cc98ca SHA1 2c377af5ee1329b5a54e37d0d4a0171890320225 SHA256 a457e7fce47bcfb61f92cdb1ba233589e59f5c6aa7ff9d1084af908939870365
+MD5 f7245bcf29e458defe9e1418db03cb6c ChangeLog 867
+RMD160 bb6d11827738c14322f60be65a407ea5b1cc98ca ChangeLog 867
+SHA256 a457e7fce47bcfb61f92cdb1ba233589e59f5c6aa7ff9d1084af908939870365 ChangeLog 867
 MISC metadata.xml 251 RMD160 30a64bf83060c110066f4c8077576aa16e55b8ca SHA1 96ef22990f891fc86990af758532d6d88d3416db SHA256 d919cadb6db629b0ca6d8f3875bf2e74846590cfa47fd59035ba1ef43248c14e
 MD5 e9be3a3468b13dd54a3aab0799fbed8d metadata.xml 251
 RMD160 30a64bf83060c110066f4c8077576aa16e55b8ca metadata.xml 251
@@ -28,7 +28,7 @@ SHA256 a73a126f0d80961af4c5b42732b7a5e545da8a9589affcfa53b268134015698c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDoLHAiZjviIA2XgRAg1oAJ9ZhJ/kuoZ6edEGpDf/lhV1cuEsHgCdGf/9
-84lEkZomRleO2RzpQq1gzNI=
-=fRzF
+iD8DBQFFDvp/AiZjviIA2XgRAnB2AKDQ2tAQqz2lPAx6WWS9LvkirMkRBACfU5iJ
+J/iB26NSxLJcmz6JCiYqGl4=
+=13Cc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bouml/bouml-2.17.ebuild b/dev-util/bouml/bouml-2.17.ebuild
index d6f953825eff..0dcdeeba44f2 100644
--- a/dev-util/bouml/bouml-2.17.ebuild
+++ b/dev-util/bouml/bouml-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/bouml-2.17.ebuild,v 1.1 2006/09/18 11:27:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/bouml-2.17.ebuild,v 1.2 2006/09/18 19:58:26 flameeyes Exp $
 
 inherit qt3 toolchain-funcs multilib eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://bouml.free.fr/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="$(qt_min_version 3)"
@@ -23,6 +23,8 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	sed -i -e '/^MAKE/d' "${S}/Makefile"
+
+	find "${S}" -name '*.pro' -print0 | xargs -0 sed -i -e '/CONFIG/s:qt:qt thread:g'
 }
 
 src_compile() {
@@ -35,8 +37,8 @@ src_compile() {
 		emake \
 			CC="$(tc-getCC) ${CFLAGS}" \
 			CXX="$(tc-getCXX) ${CXXFLAGS}" \
-			LINK="$(tc-getCXX)" \
-			LFLAGS="${LDFLAGS}" || die "emake failed"
+			LINK="$(tc-getCXX) ${LDFLAGS}" \
+			|| die "emake failed"
 		popd
 	done
 }