Fixed this up, added a patch for non-compilation, and fixed deps to depend on the correct SLOT. See bug #68331

8 files changed, 47 insertions, 65 deletions

diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog
index 5c7878bdd292..a4322a21293d 100644
--- a/gnome-extra/hardware-monitor/ChangeLog
+++ b/gnome-extra/hardware-monitor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/hardware-monitor
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.7 2004/06/24 22:07:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.8 2004/11/04 10:14:33 obz Exp $
+
+  05 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  +files/hardware-monitor-0.7-emptyconstructors.patch,
+  -hardware-monitor-0.5.1.ebuild, -hardware-monitor-0.5.ebuild,
+  hardware-monitor-0.7.ebuild:
+  Fixed this up, added a patch for non-compilation, and fixed deps to depend
+  on the correct SLOT. See bug #68331
 
   30 May 2004; Yi Qiang <khai@gentoo.org> hardware-monitor-0.5.1.ebuild,
   hardware-monitor-0.5.ebuild, hardware-monitor-0.7.ebuild:
diff --git a/gnome-extra/hardware-monitor/Manifest b/gnome-extra/hardware-monitor/Manifest
index 59323143d0ae..6307778fa26a 100644
--- a/gnome-extra/hardware-monitor/Manifest
+++ b/gnome-extra/hardware-monitor/Manifest
@@ -1,8 +1,5 @@
-MD5 ded7743e037148a484b88bc690b0c9ed hardware-monitor-0.5.1.ebuild 756
-MD5 26e8ec433ec82634426798163673a54d hardware-monitor-0.5.ebuild 754
-MD5 919fb137a11bf209e5c9b4f78bc40c7b hardware-monitor-0.7.ebuild 759
-MD5 14340c3200bdc076da3926f01895c275 ChangeLog 1049
+MD5 f035f31fcf235978b2fb2c0c26deeac4 hardware-monitor-0.7.ebuild 894
+MD5 b4512245d85460368bdcc4c50d59ae76 ChangeLog 1356
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 477ab5b60e6506e214a358754e2b0c1d files/digest-hardware-monitor-0.5 72
+MD5 c7706e923220aca13c729c09652b53d2 files/hardware-monitor-0.7-emptyconstructors.patch 634
 MD5 03811bc4c3b3cb53501f99ce14bbcad7 files/digest-hardware-monitor-0.7 72
-MD5 289f2ddef7ec1ca2de46fa36378dee7d files/digest-hardware-monitor-0.5.1 74
diff --git a/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5 b/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5
deleted file mode 100644
index 2ca3b2bb136d..000000000000
--- a/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c97cd8ee479a5d37668be39c31c575a hardware-monitor-0.5.tar.gz 186180
diff --git a/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5.1 b/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5.1
deleted file mode 100644
index e74dd6b6d76e..000000000000
--- a/gnome-extra/hardware-monitor/files/digest-hardware-monitor-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 efef6f0a2ebca49ab56634bfd7521b84 hardware-monitor-0.5.1.tar.gz 189306
diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-0.7-emptyconstructors.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-0.7-emptyconstructors.patch
new file mode 100644
index 000000000000..d8f6cf697f7d
--- /dev/null
+++ b/gnome-extra/hardware-monitor/files/hardware-monitor-0.7-emptyconstructors.patch
@@ -0,0 +1,21 @@
+--- hardware-monitor-0.7/src/pixbuf-drawing.hpp	2003-08-25 22:45:16.000000000 +0800
++++ hardware-monitor-0.7-patched/src/pixbuf-drawing.hpp	2004-11-05 01:59:35.716420136 +0800
+@@ -89,8 +89,6 @@
+ class PixelPosition
+ {
+ public:
+-  PixelPosition()
+-  {}
+ 
+   PixelPosition(unsigned char *pixel, int rs, int chnls)
+     : data(pixel), rowstride(rs), channels(chnls)
+@@ -152,9 +150,6 @@
+   typedef Pixel reference;
+   typedef std::ptrdiff_t difference_type;
+ 
+-  PixelIterator()
+-  {}
+-  
+   PixelIterator(const Glib::RefPtr<Gdk::Pixbuf> &p,
+ 		unsigned int x, unsigned int y)
+     : width(p->get_width()), channels(p->get_n_channels()),
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-0.5.1.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-0.5.1.ebuild
deleted file mode 100644
index 92b92352db2f..000000000000
--- a/gnome-extra/hardware-monitor/hardware-monitor-0.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-0.5.1.ebuild,v 1.5 2004/06/24 22:07:47 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome2 Hardware Monitor Applet using gnomemm"
-HOMEPAGE="http://www.cs.auc.dk/~olau/hardware-monitor/"
-SRC_URI="http://www.cs.auc.dk/~olau/hardware-monitor/source/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-# can add lmsensor stuff
-IUSE=""
-
-DEPEND="=dev-cpp/gtkmm-2.2.11
-	>=dev-cpp/libgnomemm-1.3.9
-	>=dev-cpp/libgnomeuimm-1.3.11
-	>=dev-cpp/libglademm-2.0.0
-	>=dev-cpp/libgnomecanvasmm-2.0.0
-	>=dev-cpp/gconfmm-2.0.1
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/libgtop-2.0"
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-0.5.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-0.5.ebuild
deleted file mode 100644
index aab38e943063..000000000000
--- a/gnome-extra/hardware-monitor/hardware-monitor-0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-0.5.ebuild,v 1.5 2004/06/24 22:07:47 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome2 Hardware Monitor Applet using gnomemm"
-HOMEPAGE="http://www.cs.auc.dk/~olau/hardware-monitor/"
-SRC_URI="http://www.cs.auc.dk/~olau/hardware-monitor/source/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-# can add lmsensor stuff
-IUSE=""
-
-DEPEND="=dev-cpp/gtkmm-2.2.11
-	>=dev-cpp/libgnomemm-1.3.9
-	>=dev-cpp/libgnomeuimm-1.3.11
-	>=dev-cpp/libglademm-2.0.0
-	>=dev-cpp/libgnomecanvasmm-2.0.0
-	>=dev-cpp/gconfmm-2.0.1
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/libgtop-2.0"
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild
index 3169ee206640..73835a6dfbb7 100644
--- a/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild
+++ b/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild,v 1.4 2004/06/24 22:07:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-0.7.ebuild,v 1.5 2004/11/04 10:14:33 obz Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome2 Hardware Monitor Applet using gnomemm"
 HOMEPAGE="http://www.cs.auc.dk/~olau/hardware-monitor/"
@@ -14,11 +14,18 @@ KEYWORDS="~x86 ~ppc"
 # can add lmsensor stuff
 IUSE=""
 
-DEPEND="=dev-cpp/gtkmm-2.2.11
-	>=dev-cpp/libgnomemm-1.3.9
-	>=dev-cpp/libgnomeuimm-1.3.11
-	>=dev-cpp/libglademm-2.0.0
-	>=dev-cpp/libgnomecanvasmm-2.0.0
-	>=dev-cpp/gconfmm-2.0.1
+DEPEND="=dev-cpp/gtkmm-2.2*
+	=dev-cpp/libgnomemm-2.0*
+	=dev-cpp/libgnomeuimm-2.0*
+	=dev-cpp/libglademm-2.0*
+	=dev-cpp/libgnomecanvasmm-2.0*
+	=dev-cpp/gconfmm-2.0*
 	>=gnome-base/gnome-panel-2.0
 	>=gnome-base/libgtop-2.0"
+
+src_unpack() {
+	# fix compilation errors (bad empty constructors)
+	unpack ${A}
+	cd ${WORKDIR}
+	epatch ${FILESDIR}/${P}-emptyconstructors.patch
+}