atk: merge unification from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4207 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/atk/atk.inc b/meta/packages/atk/atk.inc
new file mode 100644 (file)
index 0000000..5f81cdf
--- /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 07ed572505f43b924f13316774515a94c8eba569..3613f2526acb99d6d253b867e191bfcf73fd1179 100644 (file)
--- 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 a909e0eb610447b54a9fb595d608a416567c4d90..bb64492337c5ac45a9a3409c7918d1cd65232586 100644 (file)
--- 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
-}