Version bump (bug 311411), respect LDFLAGS. Remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 24 insertions, 16 deletions

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 3b20f6691d79..2d66b3ee3ee0 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/fbreader
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.15 2010/03/06 19:37:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.16 2010/04/08 17:13:01 spatz Exp $
+
+*fbreader-0.12.10 (08 Apr 2010)
+
+  08 Apr 2010; Dror Levin <spatz@gentoo.org> -fbreader-0.12.5.1.ebuild,
+  fbreader-0.12.7.ebuild, +fbreader-0.12.10.ebuild:
+  Version bump (bug 311411), respect LDFLAGS. Remove old.
 
 *fbreader-0.12.7 (06 Mar 2010)
 
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index f3eed1450f88..49845ef787fe 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST fbreader-sources-0.12.5.1.tgz 2310729 RMD160 09254cbc47a821e9bf79736ebd3f3a00ac17a305 SHA1 9866a021205cc1256b4926ead4fee142734f62b5 SHA256 7549baa34cfc22c87dae822ef35af43e2d7c808c72f07eb4e61a5d63b8722009
+DIST fbreader-sources-0.12.10.tgz 2337798 RMD160 63043c9b8e26b5511f4f7bc45637def723c9fef5 SHA1 982f526c9325fc4eaea3c01370580846c4cce7cc SHA256 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624
 DIST fbreader-sources-0.12.7.tgz 2335625 RMD160 791c0ddf77672f20b489145554379730cc7fcf59 SHA1 38bd4bbcb2fbe98fb57f5480798d4d3a2b35d01e SHA256 28aba11f5b5ac2b310e44ae9cdb1afe1faaeb5b4ca3d9af6349336ada8a30ac7
-EBUILD fbreader-0.12.5.1.ebuild 1835 RMD160 c62f43aea700ec2f291ed74ef3b93040de53d4ed SHA1 fc1a66ba230ffe01a9d357833f51d083c8014541 SHA256 9438a6baae8db0011b7464bcc0d6e863a84f6b2b8e6bcc60ff9ef778c2eaca9f
-EBUILD fbreader-0.12.7.ebuild 1832 RMD160 ba2a523ca3f41239c133026612d524fd834378ae SHA1 0cf8dcc4b51801b137eb3a77bed457e4262da3a0 SHA256 b81f9012388337399c6b924285c86c33576dd8b9a9f386d685e50c55d29f5f9d
-MISC ChangeLog 2519 RMD160 6837976ddaf8bdbafb26f871994c79bb9b912a11 SHA1 6f32478a5fc82664a31f576d3f965ffb1a9b3f7b SHA256 d5adf32620038486e21faeec049fff87336f931256a05cfa3122a9df7d626c52
+EBUILD fbreader-0.12.10.ebuild 1906 RMD160 6cbf165e90a08c2c94c41ad8d8a91c717ac77d0c SHA1 15d2ebd099099fe6ccad94cd929224494c7a82ae SHA256 d94cf5330b883cc3a66376fb348762b0cedbb04d8d90c1d41108a6a5845be617
+EBUILD fbreader-0.12.7.ebuild 1905 RMD160 e12de31a21a6d2fa4277dbf480cfcf6258553f0f SHA1 7f8acdd56133399f938f4d3e3df51d563134d5e4 SHA256 5ec85e5cab7be4a2cf0346624212c2ce7dfa4872a5a572c806f864a1a8c7d1df
+MISC ChangeLog 2735 RMD160 ee09677fcf38a75c204aac4761ea6c09113302f8 SHA1 77ec75e7b5bd94ce4f9f0d7336f1c00cb4aa48e9 SHA256 da643b23d2cb25e16157b87b5f9b089ec9fe90b5ff58acf5bbda9f270e3df735
 MISC metadata.xml 367 RMD160 a29770dbdf1951d724a3e9f4ff16be579f5748ea SHA1 6f8641392c21ed3963ef9bc96c4a1cc011995bda SHA256 ea449e9ab5b0604e10360c35f9646cf74e15a54bb6e937cea8b0479739e1a25f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLkq7lAAoJEAWF714uGAc6UiEIAJLbzvG+6uuLtPUBYOvTl2gn
-7eEDr16LoCE/nPXg3p4K+4oM+fY3yViHpkcDIPKzA2qmrVky7z8ALvWtqURFtQAY
-Ok3TA5QalUY6ZnRUAwOqwh1IJurJMwjT4eW9exevf8dKo2f0HR09ZWFmjFzEzyRG
-1l4rGTbkw7CHY+9BI2zi746RI0MK/L2ybpq8HPQokkBMGd0hS6Oi0RzS9IBnuXFO
-7cmgx6kC0By3CCYSrXITg1lW07XygcwceZ2uuSsGZ3paUyo7zwIXpgat2rFuU9Ny
-dll61iKSmT76rqsHFaEXQGS1sVU9Wn8eUJAR/sjNvSmejCBsNGKk9gHLBMa6y6w=
-=d9jh
+iQEcBAEBCgAGBQJLvg6mAAoJEAWF714uGAc6NzcH/jPF+r5at95CmCPEJgWoRIY9
+DxhYOyMeUZ6xgH5hh4aNz0DcpDay/PX/iNciClbscGv4dipIhG44KKkuOrHhxZCf
+Q05XrYrZ+q4BkueYsdJo5zvIqyJYTNA6ogE4sxZxFUdAN4EPNMUcU6aj32Sc08DU
+qKPH6u8hyI2jdu3ca+WUF6r/Kb6CqusB19+xoRNuVb6GAwih+Eojbc2tndQKL0BD
+Sh5ab3jcTZq7v/aHnioI7p7SoXJnx7PZjtjdiCjD5TVrds0Ps5llBx6NJlol7Ueu
+Cd7jdq9dEBYjDtG87/nX5v9dDT4XyB5ITClqIOv6DqOE72t4n5eBQnoZ3ihVVYA=
+=OE18
 -----END PGP SIGNATURE-----
diff --git a/app-text/fbreader/fbreader-0.12.5.1.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild
index 4e360ab8ab8a..70cffe1b7745 100644
--- a/app-text/fbreader/fbreader-0.12.5.1.ebuild
+++ b/app-text/fbreader/fbreader-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.5.1.ebuild,v 1.1 2010/02/27 23:29:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.1 2010/04/08 17:13:01 spatz Exp $
 
 EAPI=2
 
@@ -35,7 +35,8 @@ src_prepare() {
 	sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "s:^	LDFLAGS += -s::" makefiles/config.mk || die "sed failed"
+	sed -i "/^	LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed"
+	sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed"
 
 	echo "TARGET_ARCH = desktop" > makefiles/target.mk
 	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
diff --git a/app-text/fbreader/fbreader-0.12.7.ebuild b/app-text/fbreader/fbreader-0.12.7.ebuild
index effc4c97a2ee..64989fcde355 100644
--- a/app-text/fbreader/fbreader-0.12.7.ebuild
+++ b/app-text/fbreader/fbreader-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild,v 1.1 2010/03/06 19:37:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.7.ebuild,v 1.2 2010/04/08 17:13:01 spatz Exp $
 
 EAPI=2
 
@@ -35,7 +35,8 @@ src_prepare() {
 	sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "s:^	LDFLAGS += -s::" makefiles/config.mk || die "sed failed"
+	sed -i "/^	LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed"
+	sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed"
 
 	echo "TARGET_ARCH = desktop" > makefiles/target.mk
 	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk