Copyright header fixes, inherit from eutils, sed -i.

9 files changed, 30 insertions, 131 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index e42d696e7136..a6e6540a006b 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-misc/workrave
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.12 2004/01/06 20:11:13 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.13 2004/03/16 11:26:05 leonardop Exp $
 
+  16 Mar 2004; L. Boshell <leonardop@gentoo.org> workrave-1.4.0-r1.ebuild,
+  workrave-1.4.1.ebuild:
+  Inherit from eutils. Use 'sed -i'. Removed obsolete ebuilds.
+  
   06 Jan 2004; Jason Wever <weeve@gentoo.org> workrave-1.4.1.ebuild:
   Added ~sparc keyword.
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 2b263dfabaef..379b59077ddc 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,14 +1,10 @@
-MD5 bbbf501c4843fe7ba3ec04104a2de332 ChangeLog 1932
+MD5 72ea0d88f22a8d3e059e8c8c5bcd6152 ChangeLog 2102
+MD5 a12c0cac9d5eeb9b748a2785baa4365a workrave-1.4.0-r1.ebuild 2247
+MD5 bb9fb0f5455a88dfbab2cea151366041 workrave-1.2.2.ebuild 1325
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 80c52743a9a0fa5e38fff1e7463fc9dd workrave-1.0.0.ebuild 1013
-MD5 cc5c432bc40bd47f5ae7f5fb15fc4380 workrave-1.2.2.ebuild 1324
-MD5 e21b761e9608e48690d845f3ecd264c6 workrave-1.4.0-r1.ebuild 2275
-MD5 ffcad1d8e958149e36b9d2c454ed008f workrave-1.4.0.ebuild 1686
-MD5 0d6f6b1f64195d9a3e32065647fcd364 workrave-1.4.1.ebuild 2098
-MD5 eee2df47107a2d3cb227075415706c59 files/digest-workrave-1.0.0 66
-MD5 5c5d367dc02b77f1af5c9fe0b0bddf6f files/digest-workrave-1.2.2 66
-MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0 66
+MD5 83d524c9b905ce733484a812bb014a8b workrave-1.4.1.ebuild 2074
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
-MD5 1b31fa48ef903e83bf7aa9edeb3c38ae files/digest-workrave-1.4.1 66
+MD5 5c5d367dc02b77f1af5c9fe0b0bddf6f files/digest-workrave-1.2.2 66
 MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
+MD5 1b31fa48ef903e83bf7aa9edeb3c38ae files/digest-workrave-1.4.1 66
 MD5 1916d0da66305260c2926ef7d68f4510 files/workrave-1.4.1-gcc2_fixes.patch 2585
diff --git a/app-misc/workrave/files/digest-workrave-1.0.0 b/app-misc/workrave/files/digest-workrave-1.0.0
deleted file mode 100644
index 1c9fe9471861..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2019087e400dceac6d309759e62d1e54 workrave-1.0.0.tar.gz 529639
diff --git a/app-misc/workrave/files/digest-workrave-1.4.0 b/app-misc/workrave/files/digest-workrave-1.4.0
deleted file mode 100644
index e50380500ef1..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5bd1127b533b6d613335f7f240005ad workrave-1.4.0.tar.gz 968636
diff --git a/app-misc/workrave/workrave-1.0.0.ebuild b/app-misc/workrave/workrave-1.0.0.ebuild
deleted file mode 100644
index 12da27b31675..000000000000
--- a/app-misc/workrave/workrave-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.0.0.ebuild,v 1.7 2003/09/05 12:10:36 msterret Exp $
-
-DESCRIPTION="assists in the recovery and prevention of Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://workrave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls xml2 gnome"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl
-	>=dev-libs/libsigc++-1.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=dev-cpp/gtkmm-2
-	xml2? ( dev-libs/gdome2 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf=""
-
-	use nls   || myconf="--disable-nls"
-	use gnome && myconf="${myconf} --enable-gnome --enable-gconf"
-	use xml2  && myconf="${myconf} --enable-xml"
-
-	econf ${myconf}
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall
-	dodoc ABOUT-NLS AUTHORS COPYING NEWS README
-}
diff --git a/app-misc/workrave/workrave-1.2.2.ebuild b/app-misc/workrave/workrave-1.2.2.ebuild
index 9211ad7cb0f6..5a05eff496ee 100644
--- a/app-misc/workrave/workrave-1.2.2.ebuild
+++ b/app-misc/workrave/workrave-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.2.2.ebuild,v 1.4 2003/09/05 12:10:36 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.2.2.ebuild,v 1.5 2004/03/16 11:26:05 leonardop Exp $
 
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://workrave.sourceforge.net/"
diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
index 365e5bbd4d7c..7fa69d8795c2 100644
--- a/app-misc/workrave/workrave-1.4.0-r1.ebuild
+++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.5 2003/11/06 15:04:26 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.6 2004/03/16 11:26:05 leonardop Exp $
+
+inherit eutils
 
 IUSE="debug gnome nls xml2"
 # Internal USE flags
@@ -44,10 +46,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
 
 	# need to remove the configure specified CFLAGS
-	sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure > configure.sed
-	sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure.sed > configure
+	sed -i \
+		-e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		-e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		configure
 }
 
 src_compile() {
diff --git a/app-misc/workrave/workrave-1.4.0.ebuild b/app-misc/workrave/workrave-1.4.0.ebuild
deleted file mode 100644
index b4db8e6300c9..000000000000
--- a/app-misc/workrave/workrave-1.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0.ebuild,v 1.5 2003/10/17 22:00:04 leonardop Exp $
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://workrave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-# This is the first workrave ebuild with gnome support,
-# which should be considered experimental. The next
-# step should be converting to the gnome2 eclass.
-# <obz@gentoo.org>
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls xml2 gnome"
-KEYWORDS="x86 ~ppc"
-
-RDEPEND=">=dev-libs/libsigc++-1.2
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=dev-cpp/gtkmm-2
-	xml2? ( dev-libs/gdome2 )
-	gnome? ( >=gnome-base/libgnomeui-2
-			 >=dev-cpp/libgnomeuimm-1.3
-			 >=gnome-base/gnome-panel-2.0.1
-			 >=gnome-base/libbonobo-2
-			 >=gnome-base/gconf-2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# need to remove the configure specified CFLAGS
-	sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure > configure.sed
-	sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure.sed > configure
-
-}
-
-src_compile() {
-	local myconf=""
-
-	use gnome && myconf="${myconf} --enable-gnome --enable-gconf"
-	use nls   || myconf="${myconf} --disable-nls"
-	use xml2  && myconf="${myconf} --enable-xml"
-
-	econf ${myconf} --disable-distribution || die
-
-	# emake will bring nothing but trouble if you're using the `nls' USE
-	# var
-	make || die "Compilation failed"
-}
-
-src_install() {
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README*
-}
diff --git a/app-misc/workrave/workrave-1.4.1.ebuild b/app-misc/workrave/workrave-1.4.1.ebuild
index f8ce675dfc7a..a4e798399375 100644
--- a/app-misc/workrave/workrave-1.4.1.ebuild
+++ b/app-misc/workrave/workrave-1.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.1.ebuild,v 1.2 2004/01/06 20:11:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.1.ebuild,v 1.3 2004/03/16 11:26:05 leonardop Exp $
+
+inherit eutils
 
 IUSE="debug gnome nls xml2"
 # Internal USE flags
@@ -39,10 +41,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
 
 	# need to remove the configure specified CFLAGS
-	sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure > configure.sed
-	sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		< configure.sed > configure
+	sed -i \
+		-e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		-e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		configure
 }
 
 src_compile() {