gtk-engines: remove hard-coded paths. Closes 2364.

* drop versions prior ro 2.6.5
* some cosmetic clean-up
* backport solution from 2.7.4 to 2.6.5 and smooth-engine

5 files changed, 23 insertions, 84 deletions

diff --git a/packages/gtk-engines/gtk-engines_2.2.0.bb b/packages/gtk-engines/gtk-engines_2.2.0.bb
deleted file mode 100644
index 5572568f61..0000000000
--- a/packages/gtk-engines/gtk-engines_2.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
-DESCRIPTION = "GTK theme engines"
-DEPENDS = "gtk+"
-
-PACKAGES += " gtk-engine-pixmap gtk-engine-redmond95 gtk-engine-metal gtk-theme-metal gtk-theme-redmond95"
-FILES_gtk-engine-pixmap = "${libdir}/gtk-2.0/*/engines/libpixmap.so"
-FILES_gtk-engine-redmond95 = "${libdir}/gtk-2.0/*/engines/libredmond95.so"
-FILES_gtk-engine-metal = "${libdir}/gtk-2.0/*/engines/libmetal.so"
-FILES_gtk-theme-redmond95 = "${datadir}/themes/Redmond95"
-FILES_gtk-theme-metal = "${datadir}/themes/Metal"
-DEPENDS_gtk-theme-redmond95 = "gtk-engine-redmond95"
-DEPENDS_gtk-theme-metal = "gtk-engine-metal"
-
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.2/${PN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb
deleted file mode 100644
index 6e192d78fd..0000000000
--- a/packages/gtk-engines/gtk-engines_2.6.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
-DESCRIPTION = "GTK theme engines"
-DEPENDS = "gtk+"
-
-RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
-RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
-RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
-RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
-RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
-RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
-RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
-
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
-
-python populate_packages_prepend() {
-	import os.path
-
-	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines")
-	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
-
-	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
-	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
-}
-
diff --git a/packages/gtk-engines/gtk-engines_2.6.3.bb b/packages/gtk-engines/gtk-engines_2.6.3.bb
deleted file mode 100644
index 6e192d78fd..0000000000
--- a/packages/gtk-engines/gtk-engines_2.6.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
-DESCRIPTION = "GTK theme engines"
-DEPENDS = "gtk+"
-
-RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
-RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
-RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
-RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
-RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
-RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
-RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
-
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
-
-python populate_packages_prepend() {
-	import os.path
-
-	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines")
-	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
-
-	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
-	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
-}
-
diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb
index 6e192d78fd..e795791cfc 100644
--- a/packages/gtk-engines/gtk-engines_2.6.5.bb
+++ b/packages/gtk-engines/gtk-engines_2.6.5.bb
@@ -1,7 +1,9 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
+SECTION = "x11/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
 DEPENDS = "gtk+"
+PR = "r1"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
 RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
@@ -20,10 +22,11 @@ PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
 python populate_packages_prepend() {
 	import os.path
 
-	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines")
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
 	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
 
 	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
 	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
 }
-
diff --git a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
index 95a8d87d9c..28888c45ba 100644
--- a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
+++ b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
@@ -1,11 +1,22 @@
-PR = "r0"
-LICENSE = "LGPL"
-SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Smooth"
+SECTION = "x11/base"
+PRIORITY = "optional"
+LICENSE = "LGPL"
 DEPENDS = "gtk+"
-
-FILES_${PN} = "${libdir}/gtk-2.0/2.4.0/engines/libsmooth.so"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/smooth-engine/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}