[oe-commits] org.oe.dev links_2.0+2.1pre26.bb, links-x11_2.0+2.1pre26.bb : new kOEn compliant

[xora commit]

links_2.0+2.1pre26.bb, links-x11_2.0+2.1pre26.bb : new kOEn compliant
naming scheme. Also broke common stuff into links.inc and added some
python to version doesnt need to be hardcoded into .bb

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 7077b8b2641ba9a4fac75665eab0c373aa3c2d48
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7077b8b2641ba9a4fac75665eab0c373aa3c2d48
Files:
1
packages/links/links-x11_2.1pre26.bb
packages/links/links-x11_2.0+2.1pre26.bb
packages/links/links_2.1pre26.bb
packages/links/links_2.0+2.1pre26.bb
packages/links/links.inc
Diffs:

#
# mt diff -rb313b9cf6c99d6093ebf513851ebfe83e1cff10c -r7077b8b2641ba9a4fac75665eab0c373aa3c2d48
#
# 
# 
# rename "packages/links/links-x11_2.1pre26.bb"
#     to "packages/links/links-x11_2.0+2.1pre26.bb"
# 
# rename "packages/links/links_2.1pre26.bb"
#     to "packages/links/links_2.0+2.1pre26.bb"
# 
# add_file "packages/links/links.inc"
#  content [6893003055315c03a7b93d61bd75756b30126645]
# 
# patch "packages/links/links-x11_2.0+2.1pre26.bb"
#  from [68e2dc81d0ad99606100e8331ac723d8bf4b4806]
#    to [27a6af01d79901825948a0f5aa7aa1e6a134fc15]
# 
# patch "packages/links/links_2.0+2.1pre26.bb"
#  from [71bd9b87bf414f336e107268c767ba2802693cfa]
#    to [d68e882e0eb16b5b45acddc5aa53a110c120ac3e]
# 
============================================================
--- packages/links/links.inc	6893003055315c03a7b93d61bd75756b30126645
+++ packages/links/links.inc	6893003055315c03a7b93d61bd75756b30126645
@@ -0,0 +1,18 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng flex openssl zlib"
+
+LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
+
+SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+           file://ac-prog-cxx.patch;patch=1 \
+           file://cookies-save-0.96.patch;patch=1 \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+inherit autotools
+
+S = "${WORKDIR}/links-${LPV}"
+
============================================================
--- packages/links/links-x11_2.1pre26.bb	68e2dc81d0ad99606100e8331ac723d8bf4b4806
+++ packages/links/links-x11_2.0+2.1pre26.bb	27a6af01d79901825948a0f5aa7aa1e6a134fc15
@@ -1,21 +1,11 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
+require links.inc
+
+DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
 PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \
-	   file://links2.desktop \
-           http://www.xora.org.uk/oe/links2.png"
-S = "${WORKDIR}/links-${PV}"
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png"
 
-inherit autotools
-
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
 	        --without-libtiff --without-svgalib --without-fb \
============================================================
--- packages/links/links_2.1pre26.bb	71bd9b87bf414f336e107268c767ba2802693cfa
+++ packages/links/links_2.0+2.1pre26.bb	d68e882e0eb16b5b45acddc5aa53a110c120ac3e
@@ -1,18 +1,9 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
+require links.inc
+
+DEPENDS += "gpm"
 RCONFLICTS="links-x11"
 PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
 	        --without-libtiff --without-svgalib --with-fb \