Marked ~amd64, fixed compilation failure, bug #205068, thank Alessio D'Ascanio for...

Package-Manager: portage-2.1.4.4

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 3dfde0f7008f86d4c9bcf21b48545f88aee7ffc9..bcec5585353055cd09b04858778315da03a32108 100644 (file)
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -7,8 +7,8 @@ DIST socat-2.0.0-b1.tar.bz2 325120 RMD160 0d8da4cb2fc0e6d041ff114beb24e2d6325174
 EBUILD socat-1.4.0.3.ebuild 1021 RMD160 ba66ce48dda68a743dde04dc81e2eae88c79ded2 SHA1 496098c96047ef19aacccb9aa296fb9a755ee0ff SHA256 93734a8f802945bcb8cbe2d81dcc5eadd9767244cce18dd5c2e1c169c4c9cd89
 EBUILD socat-1.4.2.0-r1.ebuild 1094 RMD160 d04366abd4af5755edb51edefd27b85434f051f8 SHA1 c91a528a43a2b028e449eaedbd8ca693fa154fd4 SHA256 4917a0e165f62a41d350861542f8b50ae0d62c1d7a3b125db781ab1c8f8ac4e6
 EBUILD socat-1.4.2.0.ebuild 1024 RMD160 5f18c6a078360badfbddc761d6eab35992d1a301 SHA1 1cf0726e42904def93d68c28bafeb62a9a89d4b6 SHA256 70265ccbff3a2fec949a040fde5d6a68c5bffe76331e36b929990275855ac10a
-EBUILD socat-1.6.0.0.ebuild 1267 RMD160 2f09ab39f52424d775a01422e39997c95e11db41 SHA1 63acb344b7ecae8ff6a9a73ffa4ad86059ea8cb0 SHA256 792fff4bbc90900892cfc8bf4e02fa493ce387e669a268345557aedd45088d6a
+EBUILD socat-1.6.0.0.ebuild 1258 RMD160 0fa19d22222a78be59b501ae24946f7f219365a2 SHA1 c5e377847efcfd86c27b107cf455f51e473752ab SHA256 255b6173ae806eeb5cba2866d05a4be2c885c99e0866621880a25b02c21078f8
 EBUILD socat-1.6.0.1.ebuild 1141 RMD160 e3e17cfc5fe9d6c5f2d301893fa45a7e279cdade SHA1 0a6e6ff4e3e7f50aa9a60390ddffe429cfad4c8b SHA256 e0f3a294ea00ecd4b6c4c51e7dde64a2185bdd6040c581deb7625814850f7572
 EBUILD socat-2.0.0_beta1.ebuild 1165 RMD160 4ad1f29049f8249547d16ad3b93d7eba7d5f944f SHA1 1ffa864e9047c296fa72bc3f60c1c67c31bab493 SHA256 7a5dff1af59c5680434c197a94d3e47fc12c464a277057fc919c3c27441ad84d
-MISC ChangeLog 4576 RMD160 69aa4ad7368526105df311a40323d3c7c8d0c614 SHA1 71a219bc1be510461b834c48364ddf06fe9926c3 SHA256 84d8ad89351f0b45d12ddf971e989c82f64cf913d1cccdfe158e2e4aea164b60
+MISC ChangeLog 4679 RMD160 6f322e31d918c8da93a1d3c13bc787656417b758 SHA1 affdcddbd9479f8cf0e34f042f471aa81e4e44da SHA256 1eef5338471e0fc44888ca1b1d9ad864d0ae40fd7b7576834470735d33922d20
 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc

diff --git a/net-misc/ups-monitor/ChangeLog b/net-misc/ups-monitor/ChangeLog
index 47a88c6e343d9e627f8901edf0d64eeb6e9e291e..347a9ad464b59521a1ebf7e8423e4991c08eae7c 100644 (file)
--- a/net-misc/ups-monitor/ChangeLog
+++ b/net-misc/ups-monitor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ups-monitor
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ups-monitor/ChangeLog,v 1.7 2007/04/27 16:38:54 pva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ups-monitor/ChangeLog,v 1.8 2008/02/25 17:10:46 pva Exp $
+
+  25 Feb 2008; <pva@gentoo.org> -ups-monitor-0.8.2.ebuild,
+  ups-monitor-0.8.3-r1.ebuild:
+  Marked ~amd64, fixed compilation failure, bug #205068, thank Alessio
+  D'Ascanio for report and fix.
 
 *ups-monitor-0.8.3-r1 (27 Apr 2007)
 

diff --git a/net-misc/ups-monitor/Manifest b/net-misc/ups-monitor/Manifest
index dd804bfe706bd776eafdfdb546a428627705d970..14977f4f629b1b9b0e58f5dfb4ff2940210c3920 100644 (file)
--- a/net-misc/ups-monitor/Manifest
+++ b/net-misc/ups-monitor/Manifest
@@ -1,6 +1,4 @@
-DIST ups-monitor-0.8.2.tar.gz 123569 RMD160 021095043f695ebcb765c2c43a39492e3a995568 SHA1 5a7e6b401de9ca875799ed36a0c6a81e94db117b SHA256 a21b8b9420462ffbc479f973f6f9324f95195968a4ff487be562c4fdb10df7b1
 DIST ups-monitor-0.8.3.tar.gz 123308 RMD160 2fe344c7a9e10ccae914fded22cadd6cbc1595fc SHA1 d7dc99157bb6a5d5d8ccec6efea0e27aae5bd137 SHA256 44106570cb557313a52322df04a0f275c4e25dd3b36e2c7c79371953760b4c84
-EBUILD ups-monitor-0.8.2.ebuild 722 RMD160 915cfc47f7c08bdcd46448734247a825fe3b53d5 SHA1 2ed6a95d690c7d6a16663807afaee601cb2af167 SHA256 de6140921f8aa058fb0e070657b920ffde7abafcb142b1c3546a41a4f8bc0e6a
-EBUILD ups-monitor-0.8.3-r1.ebuild 921 RMD160 b82f23b9264554c063e6ef7171ec79dec9248fbe SHA1 3942dd24b62620fa002bbfb7753aa495966d7038 SHA256 7168bbdbf99d6db3f77cfdfeb5f92faffadb2c0c9fc0a746a414a5a7031521bb
-MISC ChangeLog 1555 RMD160 1b48e2d214f7cfc423ca70ef518c0307d962a7ab SHA1 2a734dffa9d8ce0039514151227c60418ee4814e SHA256 febab93c50f4da12329f3175708de6aff3804af2e8ea06d62ebc87f24c791a60
+EBUILD ups-monitor-0.8.3-r1.ebuild 949 RMD160 ab305ff928d984107c3b323996c12ada1c3ad278 SHA1 085daffdf68f3caef86d77174e8d3affee2c4cf1 SHA256 2f38a77afe7d6ad35f6a0bbb2195e11868c27498cd3696a553610ba65c20b54f
+MISC ChangeLog 1749 RMD160 66cce6031f71e6f6109b0087c65a184bfb1a5dff SHA1 394c23da6149117fd69f07adcc413af8ea71df09 SHA256 2d760079ee1197d3ad6d43bb3dc1be127657f9339447ca3b99b70b1d00d1637f
 MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b

diff --git a/net-misc/ups-monitor/ups-monitor-0.8.2.ebuild b/net-misc/ups-monitor/ups-monitor-0.8.2.ebuild
deleted file mode 100644 (file)
index 0a11153..0000000
--- a/net-misc/ups-monitor/ups-monitor-0.8.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ups-monitor/ups-monitor-0.8.2.ebuild,v 1.3 2006/03/13 20:31:43 jokey Exp $
-
-DESCRIPTION="A UPS monitor for NUT (Network UPS Tools)"
-HOMEPAGE="http://rudd-o.com/wp-content/projects/files/ups-monitor"
-SRC_URI="http://rudd-o.com/wp-content/projects/files/ups-monitor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-util/desktop-file-utils"
-RDEPEND=">=dev-python/gnome-python-2
-       >=gnome-base/libglade-2
-       >=dev-python/pygtk-2.4"
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-       dodoc AUTHORS NEWS README TODO ChangeLog
-}

diff --git a/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild b/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild
index f7e57e8c232a351e35be064540a5b9fa73e910c0..579d0d1bc585092da21780a01e8bc00540285c33 100644 (file)
--- a/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild
+++ b/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild,v 1.1 2007/04/27 16:38:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild,v 1.2 2008/02/25 17:10:46 pva Exp $
 
 DESCRIPTION="A UPS monitor for NUT (Network UPS Tools)"
 HOMEPAGE="http://rudd-o.com/wp-content/projects/files/ups-monitor"
@@ -8,7 +8,7 @@ SRC_URI="http://rudd-o.com/wp-content/projects/files/ups-monitor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="dev-util/desktop-file-utils"
@@ -22,6 +22,7 @@ src_unpack() {
        cd "${S}"
        sed -i -e \
        's/Categories=X-Red-Hat-Base;Application;System;/Categories=System;/g' \
+               -e 's:[.]png$::' \
        ups-monitor.desktop || die "Sed Broke!"
 }