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

4 files changed, 34 insertions, 35 deletions

diff --git a/packages/links/links-x11_2.1pre26.bb b/packages/links/links-x11_2.0+2.1pre26.bb
index ba9e531ca2..c026ca7e02 100644
--- a/packages/links/links-x11_2.1pre26.bb
+++ b/packages/links/links-x11_2.0+2.1pre26.bb
@@ -1,20 +1,10 @@
-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}"
-
-inherit autotools
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/packages/links/links.inc b/packages/links/links.inc
new file mode 100644
index 0000000000..2d299d3b57
--- /dev/null
+++ b/packages/links/links.inc
@@ -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}"
+
diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb
new file mode 100644
index 0000000000..6fcf8cef84
--- /dev/null
+++ b/packages/links/links_2.0+2.1pre26.bb
@@ -0,0 +1,11 @@
+require links.inc
+
+DEPENDS += "gpm"
+RCONFLICTS="links-x11"
+PR = "r0"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+	        --without-libtiff --without-svgalib --with-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --without-x --without-sdl"
diff --git a/packages/links/links_2.1pre26.bb b/packages/links/links_2.1pre26.bb
deleted file mode 100644
index d8519950c6..0000000000
--- a/packages/links/links_2.1pre26.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-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"
-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 \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x --without-sdl"