Added patch for the new evas and pbbuttonsd. Removed 0.1.7 as it will no

Package-Manager: portage-2.0.51.19

7 files changed, 19 insertions, 81 deletions

diff --git a/app-laptop/macosd/ChangeLog b/app-laptop/macosd/ChangeLog
index 5a7cf9925c60..5da8bee415d7 100644
--- a/app-laptop/macosd/ChangeLog
+++ b/app-laptop/macosd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/macosd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/macosd/ChangeLog,v 1.3 2005/01/01 14:47:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/macosd/ChangeLog,v 1.4 2005/04/13 21:25:21 josejx Exp $
+
+  12 Apr 2005; Joseph Jezak <josejx@gentoo.org>
+  -files/macosd-0.1.7-include-fix.diff, +files/0.1.9-evas-pbbuttonsd.patch,
+  -macosd-0.1.7.ebuild, macosd-0.1.9.ebuild:
+  Added patch for the new evas and pbbuttonsd. Removed 0.1.7 as it will no
+  longer compile.
 
 *macosd-0.1.9 (21 Oct 2004)
 
diff --git a/app-laptop/macosd/Manifest b/app-laptop/macosd/Manifest
index 6076f739ddac..0a7a0bfdd105 100644
--- a/app-laptop/macosd/Manifest
+++ b/app-laptop/macosd/Manifest
@@ -1,7 +1,5 @@
-MD5 136590371ea9ea6fcbb7365ff2e53328 ChangeLog 447
-MD5 ebbc3f9047416920e4c5a66b75974c3d macosd-0.1.7.ebuild 1212
-MD5 3d1624729af057f41d844ae6fc4d825a macosd-0.1.9.ebuild 1275
+MD5 e7f486f11ec98530036621eb5bae7aaf ChangeLog 706
+MD5 3acd133b5a1dc947584d001570dea373 macosd-0.1.9.ebuild 1341
 MD5 185c57b922f3a6264b9421ce45f098f5 metadata.xml 1045
-MD5 b06e205ccef0f87bc5dca70acf5e99a7 files/digest-macosd-0.1.7 65
-MD5 43cd825ea802fb0841d757bb667229cf files/macosd-0.1.7-include-fix.diff 1068
 MD5 1dcb5edab66af7f0a128b77c7d2b09b8 files/digest-macosd-0.1.9 65
+MD5 d41d8cd98f00b204e9800998ecf8427e files/0.1.9-evas-pbbuttonsd.patch 0
diff --git a/app-laptop/macosd/files/0.1.9-evas-pbbuttonsd.patch b/app-laptop/macosd/files/0.1.9-evas-pbbuttonsd.patch
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-laptop/macosd/files/0.1.9-evas-pbbuttonsd.patch
diff --git a/app-laptop/macosd/files/digest-macosd-0.1.7 b/app-laptop/macosd/files/digest-macosd-0.1.7
deleted file mode 100644
index 537355c79eb7..000000000000
--- a/app-laptop/macosd/files/digest-macosd-0.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4aeb934870cf2d61b0bf17708063d494 macosd-0.1.7.tar.bz2 164349
diff --git a/app-laptop/macosd/files/macosd-0.1.7-include-fix.diff b/app-laptop/macosd/files/macosd-0.1.7-include-fix.diff
deleted file mode 100644
index 22b85c115748..000000000000
--- a/app-laptop/macosd/files/macosd-0.1.7-include-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur macosd-0.1.7/utility/include/template/ArgumentList.tcc macosd-0.1.7.patched/utility/include/template/ArgumentList.tcc
---- macosd-0.1.7/utility/include/template/ArgumentList.tcc	2004-06-17 17:33:03.000000000 +0200
-+++ macosd-0.1.7.patched/utility/include/template/ArgumentList.tcc	2004-06-29 02:10:12.855629496 +0200
-@@ -1,7 +1,7 @@
- 
- #include "Compiler.hh"
- 
--#if GCC_VERSION < 30400 || __INCLUDE_LEVEL__ == 1
-+#if GCC_VERSION < 30400 && __INCLUDE_LEVEL__ == 1
- 
- #ifndef UTILITY__ARGUMENTLIST_TCC__
- #define UTILITY__ARGUMENTLIST_TCC__
-diff -Naur macosd-0.1.7/utility/include/template/Storage.tcc macosd-0.1.7.patched/utility/include/template/Storage.tcc
---- macosd-0.1.7/utility/include/template/Storage.tcc	2004-06-17 17:33:03.000000000 +0200
-+++ macosd-0.1.7.patched/utility/include/template/Storage.tcc	2004-06-29 02:10:24.070924512 +0200
-@@ -1,7 +1,7 @@
- 
- #include "Compiler.hh"
- 
--#if GCC_VERSION < 30400 || __INCLUDE_LEVEL__ == 1
-+#if GCC_VERSION < 30400 && __INCLUDE_LEVEL__ == 1
- 
- #ifndef UTILITY__STORAGE_TCC__
- #define UTILITY__STORAGE_TCC__
diff --git a/app-laptop/macosd/macosd-0.1.7.ebuild b/app-laptop/macosd/macosd-0.1.7.ebuild
deleted file mode 100644
index 248255f48eea..000000000000
--- a/app-laptop/macosd/macosd-0.1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/macosd/macosd-0.1.7.ebuild,v 1.2 2005/01/01 14:47:04 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="On-Screen-Display frontend for pbbuttonsd (only for PPC Laptops)."
-HOMEPAGE="http://www.rocklinux-consulting.de/oss/macosd/"
-SRC_URI="http://dl.rocklinux-consulting.de/oss/macosd/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-DEPEND="virtual/x11
-	>=app-laptop/pbbuttonsd-0.5.2-r1
-	>=x11-libs/evas-1.0.0.20040529_pre13
-	>=x11-libs/xosd-2.2.5"
-RDEPEND="$DEPEND"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-include-fix.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/macosd
-	dodir /usr/bin
-	einstall || die
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "Make sure that pbbuttons is running (add it to your default runlevel)"
-	einfo "and then add the following to your $HOME/.xinitrc to have macosd"
-	einfo "start whenever you launch X:"
-	einfo "macosd -n -t CleanOSX &"
-}
diff --git a/app-laptop/macosd/macosd-0.1.9.ebuild b/app-laptop/macosd/macosd-0.1.9.ebuild
index d7ca21d86902..55a1303cfbfd 100644
--- a/app-laptop/macosd/macosd-0.1.9.ebuild
+++ b/app-laptop/macosd/macosd-0.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/macosd/macosd-0.1.9.ebuild,v 1.2 2005/01/01 14:47:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/macosd/macosd-0.1.9.ebuild,v 1.3 2005/04/13 21:25:21 josejx Exp $
 
 inherit eutils
 
@@ -12,11 +12,17 @@ SLOT="0"
 KEYWORDS="~ppc"
 IUSE=""
 DEPEND="virtual/x11
-	>=app-laptop/pbbuttonsd-0.5.2-r1
-	>=x11-libs/evas-1.0.0.20040529_pre13
+	>=app-laptop/pbbuttonsd-0.6.8
+	>=x11-libs/evas-0.9.9
 	>=x11-libs/xosd-2.2.5"
 RDEPEND="$DEPEND"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-evas-pbbuttonsd.patch
+}
+
 src_compile() {
 	# can't use econf -- this packages uses ROCK Linux style configure
 	./configure \