merge of 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'

     and 'd969b9d6bcaf1b8db0c0e85d4ce95524a579055b'

7 files changed, 0 insertions, 153 deletions

diff --git a/packages/curl/curl-native_7.15.1.bb b/packages/curl/curl-native_7.15.1.bb
deleted file mode 100644
index e056ec10c3..0000000000
--- a/packages/curl/curl-native_7.15.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require curl_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-do_stage () {
-        install -d ${STAGING_INCDIR}/curl
-        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/curl/curl-native_7.16.2.bb b/packages/curl/curl-native_7.16.2.bb
deleted file mode 100644
index e056ec10c3..0000000000
--- a/packages/curl/curl-native_7.16.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require curl_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-do_stage () {
-        install -d ${STAGING_INCDIR}/curl
-        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.16.4.bb
index e056ec10c3..e056ec10c3 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.16.4.bb
diff --git a/packages/curl/curl_7.14.0.bb b/packages/curl/curl_7.14.0.bb
deleted file mode 100644
index 38050a71f1..0000000000
--- a/packages/curl/curl_7.14.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Command line tool and library for client-side URL transfers."
-LICENSE = "MIT"
-DEPENDS = "zlib"
-SECTION = "console/network"
-PR = "r3"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-S = "${WORKDIR}/curl-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-		--without-ssl \
-		--with-random=/dev/urandom \
-		--without-idn"
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/curl
-	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-PACKAGES = "curl curl-doc libcurl libcurl-dev libcurl-doc"
-FILES_${PN} = "${bindir}/curl"
-FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
-
diff --git a/packages/curl/curl_7.15.1.bb b/packages/curl/curl_7.15.1.bb
deleted file mode 100644
index 5af2dfa7e1..0000000000
--- a/packages/curl/curl_7.15.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Command line tool and library for client-side URL transfers."
-LICENSE = "MIT"
-DEPENDS = "zlib gnutls"
-SECTION = "console/network"
-PR = "r4"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-S = "${WORKDIR}/curl-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-		--without-ssl \
-		--with-random=/dev/urandom \
-		--without-idn \
-		--enable-crypto-auth \
-		"
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/curl
-	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-PACKAGES = "curl curl-doc libcurl libcurl-dev libcurl-doc"
-FILES_${PN} = "${bindir}/curl"
-FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
-
diff --git a/packages/curl/curl_7.16.0.bb b/packages/curl/curl_7.16.0.bb
deleted file mode 100644
index df98a6b4f2..0000000000
--- a/packages/curl/curl_7.16.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Command line tool and library for client-side URL transfers."
-LICENSE = "MIT"
-DEPENDS = "zlib gnutls"
-SECTION = "console/network"
-PR = "r1"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-S = "${WORKDIR}/curl-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-                --with-gnutls=${STAGING_BINDIR_CROSS}/ \
-                --without-ssl \
-		--with-random=/dev/urandom \
-		--without-idn \
-		--enable-crypto-auth \
-		"
-
-do_configure_prepend() {
-	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
-}
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/curl
-	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
-
-FILES_${PN} = "${bindir}/curl"
-
-FILES_${PN}-certs = "${datadir}/curl/curl-*"
-PACKAGE_ARCH_${PN}-certs = "all"
-
-FILES_${PN}-doc = "${mandir}/man1/curl.1"
-
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-RRECOMMENDS_lib${PN} += "${PN}-certs"
-FILES_lib${PN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-
-FILES_lib${PN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
-
diff --git a/packages/curl/curl_7.16.2.bb b/packages/curl/curl_7.16.4.bb
index f59d32d17a..f59d32d17a 100644
--- a/packages/curl/curl_7.16.2.bb
+++ b/packages/curl/curl_7.16.4.bb