[oe-commits] org.oe.dev gtkhtml: unify

[Laibsch commit]

gtkhtml: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: a87c3a73c2e99c504d832419af73a3ef26716dbf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a87c3a73c2e99c504d832419af73a3ef26716dbf
Files:
1
packages/gtkhtml/gtkhtml.inc
packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
packages/gtkhtml/gtkhtml-3.1_3.1.16.bb
packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
packages/gtkhtml/gtkhtml-3.8_3.8.2.bb
packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
Diffs:

#
# mt diff -r0336be68a99e9469e371b999f4efd84876570e4c -ra87c3a73c2e99c504d832419af73a3ef26716dbf
#
# 
# 
# add_file "packages/gtkhtml/gtkhtml.inc"
#  content [f251ed54e5835e40a505b44689c47937f89e0a54]
# 
# patch "packages/gtkhtml/gtkhtml-2.0_2.6.3.bb"
#  from [1d08f1e3094cd21514b1b977d5eae5b0abeeb4da]
#    to [ff6875c8b4c6a784931365d2663b13c695a0d17c]
# 
# patch "packages/gtkhtml/gtkhtml-3.0_3.0.10.bb"
#  from [dbe7dd6b5ba342c04e591b11940eeda18b3ee7c4]
#    to [cf3573a74fe299743928066fc20f49a8892daaf3]
# 
# patch "packages/gtkhtml/gtkhtml-3.1_3.1.16.bb"
#  from [894ceea2b3555ace43757acc146dc69db8b9aba2]
#    to [55d80a1ab3e62be9d39d5bcaf27535e34b7a3834]
# 
# patch "packages/gtkhtml/gtkhtml-3.6_3.6.2.bb"
#  from [a1f3bd66370d985e9122a43a01790a53f279584d]
#    to [8e6b36356e74e2e1e8b0ca6bb493a488f4df5610]
# 
# patch "packages/gtkhtml/gtkhtml-3.8_3.8.2.bb"
#  from [aa55c216ba3a7fc9c6714babfb36d59bc1a60cad]
#    to [a8e209ef72ac24a6edc116ba79edef51f6ba931f]
# 
# patch "packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb"
#  from [76817ea167f010aca89c2fc470fd28db721dc4ab]
#    to [1dea10bcfc0af8264cc63e94c207bceeb0429570]
# 
============================================================
--- packages/gtkhtml/gtkhtml.inc	f251ed54e5835e40a505b44689c47937f89e0a54
+++ packages/gtkhtml/gtkhtml.inc	f251ed54e5835e40a505b44689c47937f89e0a54
@@ -0,0 +1,10 @@
+DESCRIPTION = "HTML rendering/editing library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+inherit gnome
+
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc"
============================================================
--- packages/gtkhtml/gtkhtml-2.0_2.6.3.bb	1d08f1e3094cd21514b1b977d5eae5b0abeeb4da
+++ packages/gtkhtml/gtkhtml-2.0_2.6.3.bb	ff6875c8b4c6a784931365d2663b13c695a0d17c
@@ -1,22 +1,15 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
+require gtkhtml.inc
+
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
 PR = "r0"
 
-inherit gnome
-
 SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz"
 
-
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
 FILES_${PN}-dev += "${libdir}/gtkhtml"
-S = "${WORKDIR}/libgtkhtml2-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
-	mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true
+    mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true
     autotools_stage_all
 }
 
============================================================
--- packages/gtkhtml/gtkhtml-3.0_3.0.10.bb	dbe7dd6b5ba342c04e591b11940eeda18b3ee7c4
+++ packages/gtkhtml/gtkhtml-3.0_3.0.10.bb	cf3573a74fe299743928066fc20f49a8892daaf3
@@ -1,19 +1,13 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
+require gtkhtml.inc
+
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
 PR = "r2"
 
-inherit gnome
-
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
 	file://fix-missing-colormap.patch;patch=1"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
 FILES_${PN}-dev += "${libdir}/gtkhtml"
-S = "${WORKDIR}/gtkhtml-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
 	mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true
 	gnome_stage_includes
============================================================
--- packages/gtkhtml/gtkhtml-3.1_3.1.16.bb	894ceea2b3555ace43757acc146dc69db8b9aba2
+++ packages/gtkhtml/gtkhtml-3.1_3.1.16.bb	55d80a1ab3e62be9d39d5bcaf27535e34b7a3834
@@ -1,16 +1,10 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+require gtkhtml.inc
 
-inherit gnome
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.1"
-S = "${WORKDIR}/gtkhtml-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
 	mv src/libgtkhtml.pc src/libgtkhtml-3.1.pc || true
 	gnome_stage_includes
============================================================
--- packages/gtkhtml/gtkhtml-3.6_3.6.2.bb	a1f3bd66370d985e9122a43a01790a53f279584d
+++ packages/gtkhtml/gtkhtml-3.6_3.6.2.bb	8e6b36356e74e2e1e8b0ca6bb493a488f4df5610
@@ -1,16 +1,10 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+require gtkhtml.inc
 
-inherit gnome
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.6"
-S = "${WORKDIR}/gtkhtml-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
 	mv src/libgtkhtml.pc src/libgtkhtml-3.6.pc || true
 	gnome_stage_includes
============================================================
--- packages/gtkhtml/gtkhtml-3.8_3.8.2.bb	aa55c216ba3a7fc9c6714babfb36d59bc1a60cad
+++ packages/gtkhtml/gtkhtml-3.8_3.8.2.bb	a8e209ef72ac24a6edc116ba79edef51f6ba931f
@@ -1,16 +1,10 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+require gtkhtml.inc
 
-inherit gnome
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.8"
-S = "${WORKDIR}/gtkhtml-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
 	mv src/libgtkhtml.pc src/libgtkhtml-3.8.pc || true
 	gnome_stage_includes
============================================================
--- packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb	76817ea167f010aca89c2fc470fd28db721dc4ab
+++ packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb	1dea10bcfc0af8264cc63e94c207bceeb0429570
@@ -1,18 +1,12 @@
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DESCRIPTION = "HTML rendering/editing library"
+require gtkhtml.inc
+
 DEPENDS = "gtk+ gail libgnomeprint orbit2-native"
 PR = "r1"
 
-inherit gnome
-
 SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
 FILES_${PN}-dev += "${libdir}/gtkhtml"
-S = "${WORKDIR}/gtkhtml-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 do_stage() {
 	mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true
 	gnome_stage_includes