atk: unify

6 files changed, 23 insertions, 69 deletions

diff --git a/packages/atk/atk.inc b/packages/atk/atk.inc
new file mode 100644
index 0000000000..c4878d87ce
--- /dev/null
+++ b/packages/atk/atk.inc
@@ -0,0 +1,13 @@
+DEPENDS = "glib-2.0 gtk-doc"
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
+		  -I${STAGING_INCDIR}/glib-2.0/glib \
+		  -I${STAGING_INCDIR}/glib-2.0/gobject"
diff --git a/packages/atk/atk_1.10.3.bb b/packages/atk/atk_1.10.3.bb
index d04b943557..ab359172a1 100644
--- a/packages/atk/atk_1.10.3.bb
+++ b/packages/atk/atk_1.10.3.bb
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-		  -I${STAGING_INCDIR}/glib-2.0/glib \
-		  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
 do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
+        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
 }
diff --git a/packages/atk/atk_1.2.0.bb b/packages/atk/atk_1.2.0.bb
index 37e9fd1a2e..767c13fb4d 100644
--- a/packages/atk/atk_1.2.0.bb
+++ b/packages/atk/atk_1.2.0.bb
@@ -1,19 +1,8 @@
-DEPENDS = "glib-2.0"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-LICENSE = "LGPL"
+require atk.inc
 
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \
+SRC_URI = "${GNOME_MIRROR}/atk/1.2/atk-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
 
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-		  -I${STAGING_INCDIR}/glib-2.0/glib \
-		  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
 do_stage () {
 	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/atk
diff --git a/packages/atk/atk_1.6.0.bb b/packages/atk/atk_1.6.0.bb
index 1511da84d0..320a205d9f 100644
--- a/packages/atk/atk_1.6.0.bb
+++ b/packages/atk/atk_1.6.0.bb
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
 	   file://gtk-doc.patch;patch=1"
 
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-		  -I${STAGING_INCDIR}/glib-2.0/glib \
-		  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
 do_stage () {
 	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/atk
diff --git a/packages/atk/atk_1.6.1.bb b/packages/atk/atk_1.6.1.bb
index 9344d747b2..afc21753d5 100644
--- a/packages/atk/atk_1.6.1.bb
+++ b/packages/atk/atk_1.6.1.bb
@@ -1,19 +1,7 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2"
 
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-		  -I${STAGING_INCDIR}/glib-2.0/glib \
-		  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
 do_stage () {
 	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
 	autotools_stage_includes
diff --git a/packages/atk/atk_1.9.0.bb b/packages/atk/atk_1.9.0.bb
index 2dd743e146..557858318d 100644
--- a/packages/atk/atk_1.9.0.bb
+++ b/packages/atk/atk_1.9.0.bb
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/atk-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-		  -I${STAGING_INCDIR}/glib-2.0/glib \
-		  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
 do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
+        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
 }