From 2c147f87a576d38d3255b8cd4bfe8f18cba28e72 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 8 Apr 2008 15:15:42 +0000
Subject: atk: merge unification from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4207 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/atk/atk.inc       | 14 ++++++++++++++
 meta/packages/atk/atk_1.18.0.bb | 17 ++---------------
 meta/packages/atk/atk_1.20.0.bb | 12 +-----------
 3 files changed, 17 insertions(+), 26 deletions(-)
 create mode 100644 meta/packages/atk/atk.inc

diff --git a/meta/packages/atk/atk.inc b/meta/packages/atk/atk.inc
new file mode 100644
index 0000000000..5f81cdf67e
--- /dev/null
+++ b/meta/packages/atk/atk.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "glib-2.0 gtk-doc-native"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/meta/packages/atk/atk_1.18.0.bb b/meta/packages/atk/atk_1.18.0.bb
index 07ed572505..3613f2526a 100644
--- a/meta/packages/atk/atk_1.18.0.bb
+++ b/meta/packages/atk/atk_1.18.0.bb
@@ -1,16 +1,3 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-SRC_URI = "http://download.gnome.org/sources/atk/1.18/${PN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-do_stage () {
-	autotools_stage_all
-}
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-${PV}.tar.bz2"
diff --git a/meta/packages/atk/atk_1.20.0.bb b/meta/packages/atk/atk_1.20.0.bb
index a909e0eb61..bb64492337 100644
--- a/meta/packages/atk/atk_1.20.0.bb
+++ b/meta/packages/atk/atk_1.20.0.bb
@@ -1,16 +1,6 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
+require atk.inc
 
 SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-glibtest"
 
-do_stage () {
-	autotools_stage_all
-}
-- 
cgit v1.2.3