Fixing bug #335680

Package-Manager: portage-2.2_rc91/cvs/Linux i686

4 files changed, 29 insertions, 40 deletions

diff --git a/sys-apps/cobalt-panel-utils/ChangeLog b/sys-apps/cobalt-panel-utils/ChangeLog
index 377a42bb12b8..e5fe6bcdd7a8 100644
--- a/sys-apps/cobalt-panel-utils/ChangeLog
+++ b/sys-apps/cobalt-panel-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/cobalt-panel-utils
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/ChangeLog,v 1.7 2008/10/14 02:03:19 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/ChangeLog,v 1.8 2010/10/10 19:00:16 gurligebis Exp $
+
+  10 Oct 2010; <gurligebis@gentoo.org> -cobalt-panel-utils-1.0.1.ebuild,
+  cobalt-panel-utils-1.0.2.ebuild:
+  Removing old version and fixing LDFLAGS wrt. bug #335680
 
   14 Oct 2008; Jeremy Olexa <darkside@gentoo.org>
   -cobalt-panel-utils-1.0.0.ebuild, cobalt-panel-utils-1.0.1.ebuild,
diff --git a/sys-apps/cobalt-panel-utils/Manifest b/sys-apps/cobalt-panel-utils/Manifest
index c0b7eca7019a..518b87b5c519 100644
--- a/sys-apps/cobalt-panel-utils/Manifest
+++ b/sys-apps/cobalt-panel-utils/Manifest
@@ -1,6 +1,14 @@
-DIST cobalt-panel-utils-1.0.1.tar.gz 25032 RMD160 6778e1e05673662900f2a81d9304c35b5644cf6c SHA1 c173cd54b6187013619b7141fbad0e5b78a8fe78 SHA256 3f26ab6e6015ec583402882edf88118537d7a1783f6499d673f667a93787e290
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cobalt-panel-utils-1.0.2.tar.gz 24552 RMD160 944d3a21e3605766c5389cb9ce0fc99c221a4fbc SHA1 35a636fb078ae08fc54767cc47c49c86769b7ecc SHA256 b8ebc79cac21993576670d56dc36739def5ceb342da1d407710dcc278586c9d8
-EBUILD cobalt-panel-utils-1.0.1.ebuild 855 RMD160 5311f54b2805915621e7e0a5fc50455f4519bfa2 SHA1 abafb836f422331ad03c41493dad4a50f91cfdb8 SHA256 396c860d2f81eb4560a58ec72045c5e380c8b4f477a83108acf7d1500d1b241a
-EBUILD cobalt-panel-utils-1.0.2.ebuild 955 RMD160 bcc32b0d259c7557a2208a632f9b4ccbb16ab241 SHA1 1cf30e4f6852dfc24b19e99d94d7ce666f774797 SHA256 0dafe36b924aaf58d87ffa4530e6111c07a7d28cd801aefbb2fb0b73f917cb19
-MISC ChangeLog 1435 RMD160 971eb104be8a26a4477d56e912caa99a164e99d3 SHA1 3468143553010d4fc2b90501efcdd251c8c5a9d5 SHA256 bd3a147b361f083413b8368ac78bcfb888cf655af05b4507a3e456baa05a7ede
+EBUILD cobalt-panel-utils-1.0.2.ebuild 1101 RMD160 2dcce41b20ec576aa9bf0024fab54e17c7510cbe SHA1 896b41f27fe5ca3d6fba66ebdc8e7a8ea00c62d5 SHA256 55baa010a7105150e62294e71b6f72a39f9bd6644de620bdc51337997a9f6afd
+MISC ChangeLog 1605 RMD160 5e5f8e2cd3c8b93180a0648147ae41bc4e349d7e SHA1 b2a2fa678eaf43dc840f131fcb3dac5d0bf7f322 SHA256 7bff4af815db08364930a3fc5d1a8b6a8eb9097690e5579c803a959c91efbb8d
 MISC metadata.xml 383 RMD160 c4cfbcb0204b98678974cc24abe4644c62da72e2 SHA1 2be3a177234fef8b0ff082afaf5dc0fcdcb35c80 SHA256 706809d424f2c36a3a051916748b424b67aa93e477d7de1fa32ab1ec5bb41020
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyyKWkACgkQsR7PQhRXYEmFdACeLobfJ8uJnnmuYk5h1W+/jL6E
+1J4AnAtEzpF7SY/8lby7mKzneCGUcdnb
+=p0Sh
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild
deleted file mode 100644
index f059dca2e366..000000000000
--- a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild,v 1.2 2008/10/14 02:03:19 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="LCD and LED panel utilities for the Sun Cobalts"
-HOMEPAGE="http://gentoo.404ster.com/"
-SRC_URI="ftp://www.404ster.com/pub/gentoo-stuff/ebuilds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="sys-devel/gettext"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	into /
-	dosbin	"${S}"/lcd-flash "${S}"/lcd-getip "${S}"/lcd-swrite \
-	"${S}"/lcd-write "${S}"/lcd-yesno "${S}"/lcd-setcursor "${S}"/iflink \
-	"${S}"/iflinkstatus "${S}"/readbutton || die "dosbin failed"
-
-	dodoc doc/README* doc/CREDITS
-	doman doc/man/*.1
-}
diff --git a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild
index 1b7e3d296afc..be900bf21a02 100644
--- a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild
+++ b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild,v 1.4 2008/10/14 02:03:19 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild,v 1.5 2010/10/10 19:00:16 gurligebis Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -17,6 +19,13 @@ RDEPEND="sys-devel/gettext"
 DEPEND="${DEPEND}
 	sys-devel/autoconf"
 
+src_configure() {
+	sed -i \
+		-e"/^COPTS/s:= := ${CFLAGS} :" \
+		-e"/^LDFLAGS/s:= := ${LDFLAGS} :"\
+		Makefile || die "sed failed"
+}
+
 src_compile() {
 	if use static; then
 		einfo "Building as static executables"