[oe-commits] Michael 'Mickey' Lauer : pidgin: [cosmetic] improve indentation for clarity

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 70899e628d4f9598f415b756f31ed5f72115690a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=70899e628d4f9598f415b756f31ed5f72115690a

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Nov 19 01:42:22 2008 +0100

pidgin: [cosmetic] improve indentation for clarity

---

 packages/pidgin/pidgin.inc      |   69 ++++++++++++++++++--------------------
 packages/pidgin/pidgin_2.5.1.bb |   26 ++++++++-------
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc
index 7e99ba7..913cf1c 100644
--- a/packages/pidgin/pidgin.inc
+++ b/packages/pidgin/pidgin.inc
@@ -1,12 +1,12 @@
-SECTION = "x11/network"
 DESCRIPTION = "multi-protocol instant messaging client"
+SECTION = "x11/network"
 LICENSE = "GPL"
-
 DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
-RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
+
+inherit autotools gettext pkgconfig gconf
 
 EXTRA_OECONF = " \
-                --disable-audio \
+		--disable-audio \
 		--disable-perl \
 		--disable-tcl \
 		--disable-deprecated \
@@ -33,54 +33,51 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \
                        ${libdir}/purple-2/liboscar.so \
                        ${datadir}/aclocal"
 FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
-                       ${libdir}/purple-2/.debug"
+                        ${libdir}/purple-2/.debug"
 FILES_libgnt         = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" 
 FILES_libgnt-dev     = "${libdir}/gnt/*.la" 
 FILES_libgnt-dbg     = "${libdir}/gnt/.debug \
-FILES_finch         = "${bindir}/finch" 
-FILES_finch-dev     = "${libdir}/finch/*.la" 
-FILES_finch-dbg     = "${bindir}/.debug/finch \
-                       ${libdir}/finch/.debug"
+FILES_finch          = "${bindir}/finch"
+FILES_finch-dev      = "${libdir}/finch/*.la"
+FILES_finch-dbg      = "${bindir}/.debug/finch \
+                        ${libdir}/finch/.debug"
 
 FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
 	       ${datadir}/applications"
-RRECOMMENDS_${PN} += "${PN}-data "
+RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
+
 FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
 FILES_${PN}-dev += "${libdir}/${PN}/*.la"
 
-inherit autotools gettext pkgconfig gconf
-
 PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*"
 
 python populate_packages_prepend () {
 	root   = bb.data.expand('${libdir}/pidgin', d)
-        purple = bb.data.expand('${libdir}/purple-2', d)
-        finch  = bb.data.expand('${libdir}/finch', d)
+	purple = bb.data.expand('${libdir}/purple-2', d)
+	finch  = bb.data.expand('${libdir}/finch', d)
 
 	do_split_packages(d, root, '^([^l][^i][^b].*)\.so$',
-			   output_pattern='pidgin-plugin-%s',
-			   description='Pidgin plugin %s',
-			   prepend=True, extra_depends='')
+		output_pattern='pidgin-plugin-%s',
+		description='Pidgin plugin %s',
+		prepend=True, extra_depends='')
 
-        do_split_packages(d, purple, '^lib(.*)\.so$',
-			   output_pattern='libpurple-protocol-%s',
-			   description='Libpurple protocol plugin for %s',
-			   prepend=True, extra_depends='')
+	do_split_packages(d, purple, '^lib(.*)\.so$',
+		output_pattern='libpurple-protocol-%s',
+		description='Libpurple protocol plugin for %s',
+		prepend=True, extra_depends='')
 
 	do_split_packages(d, purple, '^(ssl-.*)\.so$',
-                           output_pattern='libpurple-plugin-%s',
-                           description='libpurple plugin %s',
-                           prepend=True, extra_depends='libpurple-plugin-ssl')
-
-        do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
-                           output_pattern='libpurple-plugin-%s',
-                           description='libpurple plugin %s',
-                           prepend=True, extra_depends='')
-
-        do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', 
-                           output_pattern='finch-plugin-%s',
-                           description='Finch plugin %s',
-                           prepend=True, extra_depends='')
-
-
+		output_pattern='libpurple-plugin-%s',
+		description='libpurple plugin %s',
+		prepend=True, extra_depends='libpurple-plugin-ssl')
+
+	do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
+		output_pattern='libpurple-plugin-%s',
+		description='libpurple plugin %s',
+		prepend=True, extra_depends='')
+
+	do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
+		output_pattern='finch-plugin-%s',
+		description='Finch plugin %s',
+		prepend=True, extra_depends='')
 }
diff --git a/packages/pidgin/pidgin_2.5.1.bb b/packages/pidgin/pidgin_2.5.1.bb
index dc919ea..17d0270 100644
--- a/packages/pidgin/pidgin_2.5.1.bb
+++ b/packages/pidgin/pidgin_2.5.1.bb
@@ -1,15 +1,17 @@
 require pidgin.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-           file://sanitize-configure.ac.patch;patch=1 \
-           file://gconf-no-errors.patch;patch=1 \
-	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	   file://purple-OE-branding-25.patch;patch=1 \
-	   file://pidgin-cross-python.patch;patch=1 \
-	  " 
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+  file://sanitize-configure.ac.patch;patch=1 \
+  file://gconf-no-errors.patch;patch=1 \
+  file://pidgin.desktop-set-icon.patch;patch=1 \
+  file://purple-OE-branding-25.patch;patch=1 \
+  file://pidgin-cross-python.patch;patch=1 \
+" 
 
-EXTRA_OECONF += " --disable-gtkspell \
-                  --disable-meanwhile \
-                  --disable-nm \ 
-                  --disable-screensaver \
-                "
+EXTRA_OECONF += "\
+  --disable-gtkspell \
+  --disable-meanwhile \
+  --disable-nm \ 
+  --disable-screensaver \
+"