diff -ur --exclude-from=exc old/eclass/gpe.eclass ./eclass/gpe.eclass
--- old/eclass/gpe.eclass	2005-08-05 00:50:42.000000000 +0200
+++ ./eclass/gpe.eclass	2005-08-05 12:43:47.000000000 +0200
@@ -13,10 +13,10 @@
 
 GPECONF=""              # extra configure opts passed to econf
 ELTCONF=""              # extra options passed to elibtoolize
+DOCS=""                 # documentation files to be installed with dodoc
 
 [ -z "${GPE_MIRROR}" ] && export GPE_MIRROR="http://ftp.handhelds.org/pub/projects/gpe/source"
 [ -z "${GPE_TARBALL_SUFFIX}" ] && export GPE_TARBALL_SUFFIX="gz"
-[ -z "${DOCS}" ] && export DOCS=""
 
 SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}"
 HOMEPAGE="http://gpe.handhelds.org/"
diff -ur --exclude-from=exc old/gpe-base/gpe-calculator/gpe-calculator-0.2.ebuild ./gpe-base/gpe-calculator/gpe-calculator-0.2.ebuild
--- old/gpe-base/gpe-calculator/gpe-calculator-0.2.ebuild	2005-08-05 00:21:31.000000000 +0200
+++ ./gpe-base/gpe-calculator/gpe-calculator-0.2.ebuild	2005-08-05 12:43:53.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="A scientific calculator for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS=""
 
-inherit eutils gpe
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
diff -ur --exclude-from=exc old/gpe-base/gpe-calendar/gpe-calendar-0.62.ebuild ./gpe-base/gpe-calendar/gpe-calendar-0.62.ebuild
--- old/gpe-base/gpe-calendar/gpe-calendar-0.62.ebuild	2005-08-05 00:22:54.000000000 +0200
+++ ./gpe-base/gpe-calendar/gpe-calendar-0.62.ebuild	2005-08-05 12:43:58.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Calendar application for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libeventdb-0.15
 	>=gpe-base/libschedule-0.14
diff -ur --exclude-from=exc old/gpe-base/gpe-contacts/gpe-contacts-0.41.ebuild ./gpe-base/gpe-contacts/gpe-contacts-0.41.ebuild
--- old/gpe-base/gpe-contacts/gpe-contacts-0.41.ebuild	2005-08-05 00:24:03.000000000 +0200
+++ ./gpe-base/gpe-contacts/gpe-contacts-0.41.ebuild	2005-08-05 12:44:29.000000000 +0200
@@ -2,18 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="Contacts manager for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
-
-inherit gpe
-
-GPECONF="--disable-dbus"
+GPECONF="${GPECONF} --disable-dbus"
 
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpevtype-0.12
diff -ur --exclude-from=exc old/gpe-base/gpe-edit/gpe-edit-0.29.ebuild ./gpe-base/gpe-edit/gpe-edit-0.29.ebuild
--- old/gpe-base/gpe-edit/gpe-edit-0.29.ebuild	2005-08-05 00:24:25.000000000 +0200
+++ ./gpe-base/gpe-edit/gpe-edit-0.29.ebuild	2005-08-05 12:36:11.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Editor for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.102
 	gpe-base/libdisplaymigration"
diff -ur --exclude-from=exc old/gpe-base/gpe-gallery/gpe-gallery-0.96.ebuild ./gpe-base/gpe-gallery/gpe-gallery-0.96.ebuild
--- old/gpe-base/gpe-gallery/gpe-gallery-0.96.ebuild	2005-08-05 00:24:58.000000000 +0200
+++ ./gpe-base/gpe-gallery/gpe-gallery-0.96.ebuild	2005-08-05 12:36:18.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Image viewer for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.102"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-go/gpe-go-0.05.ebuild ./gpe-base/gpe-go/gpe-go-0.05.ebuild
--- old/gpe-base/gpe-go/gpe-go-0.05.ebuild	2005-08-05 00:25:27.000000000 +0200
+++ ./gpe-base/gpe-go/gpe-go-0.05.ebuild	2005-08-05 12:36:28.000000000 +0200
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="A Go Board for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-inherit eutils gpe
-
 DOCS="NEWS"
 
 src_unpack() {
diff -ur --exclude-from=exc old/gpe-base/gpe-icons/gpe-icons-0.25.ebuild ./gpe-base/gpe-icons/gpe-icons-0.25.ebuild
--- old/gpe-base/gpe-icons/gpe-icons-0.25.ebuild	2005-08-05 00:44:42.000000000 +0200
+++ ./gpe-base/gpe-icons/gpe-icons-0.25.ebuild	2005-08-05 12:36:36.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Common icons for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=x11-libs/gtk+-2.6.3"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-life/gpe-life-0.2.ebuild ./gpe-base/gpe-life/gpe-life-0.2.ebuild
--- old/gpe-base/gpe-life/gpe-life-0.2.ebuild	2005-08-05 00:27:56.000000000 +0200
+++ ./gpe-base/gpe-life/gpe-life-0.2.ebuild	2005-08-05 12:36:43.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Conway's Game of Life for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gnome-base/libglade-2.5.0"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-lights/gpe-lights-0.13.ebuild ./gpe-base/gpe-lights/gpe-lights-0.13.ebuild
--- old/gpe-base/gpe-lights/gpe-lights-0.13.ebuild	2005-08-05 00:28:36.000000000 +0200
+++ ./gpe-base/gpe-lights/gpe-lights-0.13.ebuild	2005-08-05 12:36:53.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="A simple light puzzle for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS=""
 
-inherit eutils gpe
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
diff -ur --exclude-from=exc old/gpe-base/gpe-mileage/gpe-mileage-0.1.ebuild ./gpe-base/gpe-mileage/gpe-mileage-0.1.ebuild
--- old/gpe-base/gpe-mileage/gpe-mileage-0.1.ebuild	2005-08-05 00:29:01.000000000 +0200
+++ ./gpe-base/gpe-mileage/gpe-mileage-0.1.ebuild	2005-08-05 12:37:30.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="A mileage calculator for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gnome-base/libglade-2.5.0
 	=dev-db/sqlite-2.8*"
diff -ur --exclude-from=exc old/gpe-base/gpe-mixer/gpe-mixer-0.42.ebuild ./gpe-base/gpe-mixer/gpe-mixer-0.42.ebuild
--- old/gpe-base/gpe-mixer/gpe-mixer-0.42.ebuild	2005-08-05 00:30:03.000000000 +0200
+++ ./gpe-base/gpe-mixer/gpe-mixer-0.42.ebuild	2005-08-05 12:37:57.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Audio mixer for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="AUTHORS COPYING ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.102"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-othello/gpe-othello-0.2_p1.ebuild ./gpe-base/gpe-othello/gpe-othello-0.2_p1.ebuild
--- old/gpe-base/gpe-othello/gpe-othello-0.2_p1.ebuild	2005-08-05 00:30:42.000000000 +0200
+++ ./gpe-base/gpe-othello/gpe-othello-0.2_p1.ebuild	2005-08-05 12:38:09.000000000 +0200
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="Othello clone for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-inherit eutils gpe
-
 SRC_URI="${GPE_MIRROR}/${PN}-${PV/_p/-}.tar.${GPE_TARBALL_SUFFIX}"
 S="${WORKDIR}/${PN}-${PV/_p/-}"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-plucker/gpe-plucker-0.2.ebuild ./gpe-base/gpe-plucker/gpe-plucker-0.2.ebuild
--- old/gpe-base/gpe-plucker/gpe-plucker-0.2.ebuild	2005-08-05 00:31:36.000000000 +0200
+++ ./gpe-base/gpe-plucker/gpe-plucker-0.2.ebuild	2005-08-05 12:38:26.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="Plucker ebook reader for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="README README-GPE ToDo"
 
-inherit eutils gpe
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
diff -ur --exclude-from=exc old/gpe-base/gpe-sketchbook/gpe-sketchbook-0.2.8.ebuild ./gpe-base/gpe-sketchbook/gpe-sketchbook-0.2.8.ebuild
--- old/gpe-base/gpe-sketchbook/gpe-sketchbook-0.2.8.ebuild	2005-08-05 00:32:51.000000000 +0200
+++ ./gpe-base/gpe-sketchbook/gpe-sketchbook-0.2.8.ebuild	2005-08-05 12:38:45.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="A notebook to sketch notes for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="AUTHORS COPYING ChangeLog NEWS README TODO"
 
-inherit eutils gpe
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
diff -ur --exclude-from=exc old/gpe-base/gpe-tetris/gpe-tetris-0.6_p4.ebuild ./gpe-base/gpe-tetris/gpe-tetris-0.6_p4.ebuild
--- old/gpe-base/gpe-tetris/gpe-tetris-0.6_p4.ebuild	2005-08-05 00:33:32.000000000 +0200
+++ ./gpe-base/gpe-tetris/gpe-tetris-0.6_p4.ebuild	2005-08-05 12:38:56.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils gpe
+
 DESCRIPTION="Tetris for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="COPYING ChangeLog README THANKS"
 
-inherit eutils gpe
-
 SRC_URI="${GPE_MIRROR}/${PN}-${PV/_p/-}.tar.${GPE_TARBALL_SUFFIX}"
 S="${WORKDIR}/${PN}-${PV/_p/-}"
 
diff -ur --exclude-from=exc old/gpe-base/gpe-today/gpe-today-0.08.ebuild ./gpe-base/gpe-today/gpe-today-0.08.ebuild
--- old/gpe-base/gpe-today/gpe-today-0.08.ebuild	2005-08-05 00:34:06.000000000 +0200
+++ ./gpe-base/gpe-today/gpe-today-0.08.ebuild	2005-08-05 12:39:03.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Appointments and tasks summary application for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="AUTHORS HACKING"
 
-inherit gpe
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
diff -ur --exclude-from=exc old/gpe-base/gpe-todo/gpe-todo-0.54.ebuild ./gpe-base/gpe-todo/gpe-todo-0.54.ebuild
--- old/gpe-base/gpe-todo/gpe-todo-0.54.ebuild	2005-08-05 00:34:42.000000000 +0200
+++ ./gpe-base/gpe-todo/gpe-todo-0.54.ebuild	2005-08-05 12:46:12.000000000 +0200
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="To-do list application for the GPE Palmtop Environment"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libtododb-0.09
 	>=gpe-base/libgpepimc-0.5
diff -ur --exclude-from=exc old/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild ./gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild
--- old/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild	2005-08-05 00:35:19.000000000 +0200
+++ ./gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild	2005-08-05 12:39:34.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Gtk+ display migration library"
 
 LICENSE="LGPL-2"
@@ -10,8 +12,6 @@
 
 DOCS=""
 
-inherit gpe
-
 src_install() {
 
 	gpe_src_install "$@"
diff -ur --exclude-from=exc old/gpe-base/libeventdb/libeventdb-0.15.ebuild ./gpe-base/libeventdb/libeventdb-0.15.ebuild
--- old/gpe-base/libeventdb/libeventdb-0.15.ebuild	2005-08-05 00:35:49.000000000 +0200
+++ ./gpe-base/libeventdb/libeventdb-0.15.ebuild	2005-08-05 12:39:42.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Database access library for GPE calendar"
 
 LICENSE="LGPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 src_install() {
 
 	gpe_src_install "$@"
diff -ur --exclude-from=exc old/gpe-base/libgpepimc/libgpepimc-0.5.ebuild ./gpe-base/libgpepimc/libgpepimc-0.5.ebuild
--- old/gpe-base/libgpepimc/libgpepimc-0.5.ebuild	2005-08-05 00:37:09.000000000 +0200
+++ ./gpe-base/libgpepimc/libgpepimc-0.5.ebuild	2005-08-05 12:39:55.000000000 +0200
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="Common code for PIM applications of the GPE Palmtop Environment"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.102
 	=dev-db/sqlite-2.8*"
diff -ur --exclude-from=exc old/gpe-base/libgpevtype/libgpevtype-0.12.ebuild ./gpe-base/libgpevtype/libgpevtype-0.12.ebuild
--- old/gpe-base/libgpevtype/libgpevtype-0.12.ebuild	2005-08-05 00:37:37.000000000 +0200
+++ ./gpe-base/libgpevtype/libgpevtype-0.12.ebuild	2005-08-05 12:40:07.000000000 +0200
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="Data interchange library for the GPE Palmtop Environment"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	gpe-base/libmimedir"
 
diff -ur --exclude-from=exc old/gpe-base/libgpewidget/libgpewidget-0.102.ebuild ./gpe-base/libgpewidget/libgpewidget-0.102.ebuild
--- old/gpe-base/libgpewidget/libgpewidget-0.102.ebuild	2005-08-05 00:38:04.000000000 +0200
+++ ./gpe-base/libgpewidget/libgpewidget-0.102.ebuild	2005-08-05 12:40:20.000000000 +0200
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="A collection of widgets and other common code shared by many GPE applications."
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=x11-libs/gtk+-2.6.3
 	>=gpe-base/gpe-icons-0.25"
diff -ur --exclude-from=exc old/gpe-base/libmimedir/libmimedir-20040307.ebuild ./gpe-base/libmimedir/libmimedir-20040307.ebuild
--- old/gpe-base/libmimedir/libmimedir-20040307.ebuild	2005-08-05 00:40:15.000000000 +0200
+++ ./gpe-base/libmimedir/libmimedir-20040307.ebuild	2005-08-05 12:40:59.000000000 +0200
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="RFC2425 MIME Directory Profile library, supporting vCard and iCalendar"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-IUSE="doc"
-use doc || GPECONF="--disable-gtk-doc"
+IUSE="${IUSE} doc"
+use doc || GPECONF="${GPECONF} --disable-gtk-doc"
 DOCS="AUTHORS COPYING COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
-inherit gpe
-
 src_compile() {
 	rm config.*
 	autoreconf --install
diff -ur --exclude-from=exc old/gpe-base/libschedule/libschedule-0.14.ebuild ./gpe-base/libschedule/libschedule-0.14.ebuild
--- old/gpe-base/libschedule/libschedule-0.14.ebuild	2005-08-05 00:40:44.000000000 +0200
+++ ./gpe-base/libschedule/libschedule-0.14.ebuild	2005-08-05 12:41:07.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="RTC alarm handling library for the GPE Palmtop Environment"
 
 LICENSE="LGPL-2"
@@ -10,8 +12,6 @@
 
 DOCS="ChangeLog"
 
-inherit gpe
-
 src_install() {
 
 	gpe_src_install "$@"
diff -ur --exclude-from=exc old/gpe-base/libtododb/libtododb-0.09.ebuild ./gpe-base/libtododb/libtododb-0.09.ebuild
--- old/gpe-base/libtododb/libtododb-0.09.ebuild	2005-08-05 00:41:07.000000000 +0200
+++ ./gpe-base/libtododb/libtododb-0.09.ebuild	2005-08-05 12:41:18.000000000 +0200
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe
+
 DESCRIPTION="Database access library for GPE to-do list"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 arm"
 
-GPE_TARBALL_SUFFIX="bz2"
 DOCS="ChangeLog"
 
-inherit gpe
-
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.102
 	>=gpe-base/libgpepimc-0.5
diff -ur --exclude-from=exc old/gpe-base/libxsettings/libxsettings-0.11.ebuild ./gpe-base/libxsettings/libxsettings-0.11.ebuild
--- old/gpe-base/libxsettings/libxsettings-0.11.ebuild	2005-08-05 00:41:27.000000000 +0200
+++ ./gpe-base/libxsettings/libxsettings-0.11.ebuild	2005-08-05 12:41:29.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit gpe
+
 DESCRIPTION="Common code for XSETTINGS"
 
 LICENSE="X11"
@@ -10,8 +12,6 @@
 
 DOCS=""
 
-inherit gpe
-
 src_install() {
 
 	gpe_src_install "$@"