From 423a494965ea3b8f912f7826e132d535aabf5a32 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Nov 2016 13:14:10 -0500 Subject: net-libs/libqmi: drop old <1.12 versions --- net-libs/libqmi/Manifest | 4 - net-libs/libqmi/files/libqmi-1.0.0-python3.patch | 176 ----------------------- net-libs/libqmi/libqmi-1.0.0.ebuild | 50 ------- net-libs/libqmi/libqmi-1.10.2.ebuild | 43 ------ net-libs/libqmi/libqmi-1.4.0.ebuild | 44 ------ net-libs/libqmi/libqmi-1.8.0.ebuild | 43 ------ 6 files changed, 360 deletions(-) delete mode 100644 net-libs/libqmi/files/libqmi-1.0.0-python3.patch delete mode 100644 net-libs/libqmi/libqmi-1.0.0.ebuild delete mode 100644 net-libs/libqmi/libqmi-1.10.2.ebuild delete mode 100644 net-libs/libqmi/libqmi-1.4.0.ebuild delete mode 100644 net-libs/libqmi/libqmi-1.8.0.ebuild (limited to 'net-libs/libqmi') diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest index 5d387c6e824e..19a752509d9f 100644 --- a/net-libs/libqmi/Manifest +++ b/net-libs/libqmi/Manifest @@ -1,7 +1,3 @@ -DIST libqmi-1.0.0.tar.gz 2398450 SHA256 aea6b4c027bc24bdf5a624b50be8413c796c266c1e134425a8e783fb7b5ff419 SHA512 7d1a057fadd65e16e623670cc1a6292c9dc2e22630d329e820320c70acbabba519280bd76a954a5308d395cae23893ba5700b213e397457a8b7410ec6b8fc157 WHIRLPOOL 95a3341068d852f3754ba8c8bfa139a03de38e9a0ad861c84124e3cf55740576a66f8c9a1b33dac8d7c8b3f4924ac3be5a26ccf95d876c79c431949dcb19e2c3 -DIST libqmi-1.10.2.tar.xz 643256 SHA256 0d70b10810e45aebb4af902db59972d756441ca1e301240c5c529ef0f08bf80f SHA512 01f82d674ee1554473660b046fa3cc75f0d4f628d866fc1c111080c06cdb941d6d69950f2efce0f5839c461b459d51f14bf840e4f410a4beb0fad6e4c7dea2e9 WHIRLPOOL a7615cbbb195c94eb493edad0282f4bdf0ca695c3964331e00aa403e2dd83062eda1fd04cfdc77b84f9d9aebf213bc64726c0cc715d4f9ad6368f36cbffb6542 DIST libqmi-1.12.6.tar.xz 710564 SHA256 0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780 SHA512 7001f61dbe2be431867a504dbfc634ed5e7c3f3b1740aef7833fb8163d1a6bdffb57793f09062f49c0b8eeff5a011a2a057a938d618f3547ff5942021b3e8a9d WHIRLPOOL 23e4b2d6349f7b6d6c88716787cc06fba5f5eaa426fb6af5d09662fe7e59251a63dd5bace691dcb1e5f76a1457caa382ab7a5e7bf7f123d276965aee79878200 DIST libqmi-1.14.0.tar.xz 759472 SHA256 6618fb92ffe6d017d7fd18082b5c13da954c3c9060f7cc4f8807ba7b2bea349d SHA512 d5b4affe479e4704a9d94232bbef096533322413de8ea3c27d3ab7d6fd077fbbae779b49633fa22833ab1ce25f76cf341bfb84ec81d75fdc477f2a355ac298bd WHIRLPOOL d3054a0bcafd38e7a488d7b4df93b38a84844f30e5157688c638816d491800471fc7e48f2e4e54e053fc14d7f16dd65eb899a74db125ac1399cc964b66caad56 DIST libqmi-1.16.0.tar.xz 734280 SHA256 7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a SHA512 e8ac10b72a15ab3d102ab5dd45ed2960f552d37c291b7ef2818f41d5a46121a5c25e60bb549f96d4982468607a11f33866632c13b0454c5cbe0d61aa95992996 WHIRLPOOL 5168a137fd205c357ff61aa733907d1e8e71832937c0d01ce2ecb55c5e2271bcfd5387c76cbb022df2915adb666bfe8cf763a129f74c3218c53b4dfdc95bd44d -DIST libqmi-1.4.0.tar.xz 592684 SHA256 812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3 SHA512 ca20352ba0eb4e03946b366ddcfec2892fda1e5dc8351816ee2314bc3d4235637eb143066f0f96bd9a9b5b5b3198265432beb8a984617e6618ddbd5c937e2b93 WHIRLPOOL 99418e9c91f89058279f9353b8b2b277f12fdda85f3114b005be59db9432fed91148bd6bcb3519bc4267cd2d1479c818cd8816d9c6d38a7721ad18f6b2fdd80e -DIST libqmi-1.8.0.tar.xz 659720 SHA256 fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d SHA512 016fdcdb8e66452be5c82107f00189292822afe97ec3e3a458b5a6bce2174a428035d76efd5f57497a07bfd62991e4330ebe150e91dd178c4f698be8e537d372 WHIRLPOOL 67f9addbb70203dfdb3bf379a1599ce9df197a1cc8e619795c08e28f3247c730f3f106fd02368834815cf1b55b64d22dc23a5108a42e8c509cd9ac4cc1593a93 diff --git a/net-libs/libqmi/files/libqmi-1.0.0-python3.patch b/net-libs/libqmi/files/libqmi-1.0.0-python3.patch deleted file mode 100644 index 152804dc3656..000000000000 --- a/net-libs/libqmi/files/libqmi-1.0.0-python3.patch +++ /dev/null @@ -1,176 +0,0 @@ -http://bugs.gentoo.org/464314 - -upstream seems to have this fixed already - ---- a/build-aux/qmi-codegen/Client.py -+++ b/build-aux/qmi-codegen/Client.py -@@ -61,10 +61,10 @@ class Client: - break - - translations = { 'underscore' : utils.build_underscore_name(self.name), -- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])), -+ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(), - 'camelcase' : utils.build_camelcase_name(self.name), - 'hyphened' : utils.build_dashed_name(self.name), -- 'service' : string.upper(self.service) } -+ 'service' : self.service.upper() } - - # Emit class header - template = ( -@@ -207,8 +207,8 @@ class Client: - # At least one field in the indication - translations['output_camelcase'] = utils.build_camelcase_name(message.output.fullname) - translations['bundle_type'] = 'QMI_TYPE_' + utils.remove_prefix(utils.build_underscore_uppercase_name(message.output.fullname), 'QMI_') -- translations['service'] = string.upper(self.service) -- translations['message_name_dashed'] = string.replace(message.name, ' ', '-') -+ translations['service'] = self.service.upper() -+ translations['message_name_dashed'] = message.name.replace(' ', '-') - inner_template += ( - '\n' - ' /**\n' -@@ -263,8 +263,8 @@ class Client: - def __emit_methods(self, hfile, cfile, message_list): - translations = { 'underscore' : utils.build_underscore_name(self.name), - 'camelcase' : utils.build_camelcase_name (self.name), -- 'service_lowercase' : string.lower(self.service), -- 'service_uppercase' : string.upper(self.service), -+ 'service_lowercase' : self.service.lower(), -+ 'service_uppercase' : self.service.upper(), - 'service_camelcase' : string.capwords(self.service) } - - for message in message_list.list: -@@ -518,7 +518,7 @@ class Client: - """ - def emit_sections(self, sfile): - translations = { 'underscore' : utils.build_underscore_name(self.name), -- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])), -+ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(), - 'camelcase' : utils.build_camelcase_name (self.name), - 'hyphened' : utils.build_dashed_name (self.name) } - ---- a/build-aux/qmi-codegen/Field.py -+++ b/build-aux/qmi-codegen/Field.py -@@ -57,10 +57,10 @@ class Field: - self.variable = VariableFactory.create_variable(dictionary, self.fullname, self.container_type) - - # Create the variable name within the Container -- self.variable_name = 'arg_' + string.lower(utils.build_underscore_name(self.name)) -+ self.variable_name = 'arg_' + utils.build_underscore_name(self.name).lower() - - # Create the ID enumeration name -- self.id_enum_name = string.upper(utils.build_underscore_name(self.prefix + ' TLV ' + self.name)) -+ self.id_enum_name = utils.build_underscore_name(self.prefix + ' TLV ' + self.name).upper() - - # Output Fields may have prerequisites - self.prerequisites = [] ---- a/build-aux/qmi-codegen/Message.py -+++ b/build-aux/qmi-codegen/Message.py -@@ -53,7 +53,7 @@ class Message: - self.fullname = self.prefix + ' ' + self.service + ' ' + self.name - - # Create the ID enumeration name -- self.id_enum_name = string.upper(utils.build_underscore_name(self.fullname)) -+ self.id_enum_name = utils.build_underscore_name(self.fullname).upper() - - # Build output container. - # Every defined message will have its own output container, which ---- a/build-aux/qmi-codegen/MessageList.py -+++ b/build-aux/qmi-codegen/MessageList.py -@@ -109,7 +109,7 @@ class MessageList: - messages of a given service. - """ - def __emit_get_printable(self, hfile, cfile): -- translations = { 'service' : string.lower(self.service) } -+ translations = { 'service' : self.service.lower() } - - template = ( - '\n' -@@ -175,7 +175,7 @@ class MessageList: - introduced. - """ - def __emit_get_version_introduced(self, hfile, cfile): -- translations = { 'service' : string.lower(self.service) } -+ translations = { 'service' : self.service.lower() } - - template = ( - '\n' ---- a/build-aux/qmi-codegen/Variable.py -+++ b/build-aux/qmi-codegen/Variable.py -@@ -45,7 +45,7 @@ class Variable: - self.needs_dispose = False - - self.endian = "QMI_ENDIAN_LITTLE" -- if dictionary.has_key('endian'): -+ if 'endian' in dictionary: - endian = dictionary['endian'] - if endian == 'network' or endian == 'big': - self.endian = "QMI_ENDIAN_BIG" ---- a/build-aux/qmi-codegen/VariableArray.py -+++ b/build-aux/qmi-codegen/VariableArray.py -@@ -86,7 +86,7 @@ class VariableArray(Variable): - def clear_func_name(self): - # element public format might be a base type like 'gchar *' rather - # than a structure name like QmiFooBar -- elt_name = string.replace(self.array_element.public_format, '*', 'pointer') -+ elt_name = self.array_element.public_format.replace('*', 'pointer') - return utils.build_underscore_name(self.name) + \ - '_' + \ - utils.build_underscore_name_from_camelcase(utils.build_camelcase_name(elt_name)) ---- a/build-aux/qmi-codegen/VariableInteger.py -+++ b/build-aux/qmi-codegen/VariableInteger.py -@@ -247,7 +247,7 @@ class VariableInteger(Variable): - '${lp} g_string_append_printf (${printable}, "%s", tmp ? "yes" : "no");\n') - elif self.public_format != self.private_format: - translations['public_type_underscore'] = utils.build_underscore_name_from_camelcase(self.public_format) -- translations['public_type_underscore_upper'] = string.upper(utils.build_underscore_name_from_camelcase(self.public_format)) -+ translations['public_type_underscore_upper'] = utils.build_underscore_name_from_camelcase(self.public_format).upper() - template += ( - '#if defined __${public_type_underscore_upper}_IS_ENUM__\n' - '${lp} g_string_append_printf (${printable}, "%s", ${public_type_underscore}_get_string ((${public_format})tmp));\n' ---- a/build-aux/qmi-codegen/utils.py -+++ b/build-aux/qmi-codegen/utils.py -@@ -54,7 +54,7 @@ def add_copyright(f): - Build a header guard string based on the given filename - """ - def build_header_guard(output_name): -- return "__LIBQMI_GLIB_" + string.upper(string.replace (output_name, '-', '_')) + "__" -+ return "__LIBQMI_GLIB_" + output_name.replace('-', '_').upper() + "__" - - - """ -@@ -145,7 +145,7 @@ Build an underscore name from the given full name - e.g.: "This is a message" --> "this_is_a_message" - """ - def build_underscore_name(name): -- return string.lower(string.replace (name, ' ', '_')) -+ return name.replace(' ', '_').lower() - - - """ -@@ -153,7 +153,7 @@ Build an underscore uppercase name from the given full name - e.g.: "This is a message" --> "THIS_IS_A_MESSAGE" - """ - def build_underscore_uppercase_name(name): -- return string.upper(string.replace (name, ' ', '_')) -+ return name.replace(' ', '_').upper() - - - """ -@@ -170,7 +170,7 @@ Build a camelcase name from the given full name - e.g.: "This is a message" --> "ThisIsAMessage" - """ - def build_camelcase_name(name): -- return string.replace(string.capwords(name), ' ', '') -+ return string.capwords(name).replace(' ', '') - - - """ -@@ -178,7 +178,7 @@ Build a dashed lowercase name from the given full name - e.g.: "This is a message" --> "this-is-a-message" - """ - def build_dashed_name(name): -- return string.replace(string.lower(name), ' ', '-') -+ return name.replace(' ', '-').lower() - - - """ diff --git a/net-libs/libqmi/libqmi-1.0.0.ebuild b/net-libs/libqmi/libqmi-1.0.0.ebuild deleted file mode 100644 index f32462a7f979..000000000000 --- a/net-libs/libqmi/libqmi-1.0.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit multilib autotools eutils -if [[ ${PV} == "9999" ]] ; then - inherit git-2 - EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi" -else - KEYWORDS="~amd64 ~arm ~mips ~x86" - SRC_URI="https://cgit.freedesktop.org/libqmi/snapshot/${P}.tar.gz" -fi - -DESCRIPTION="QMI modem protocol helper library" -HOMEPAGE="https://cgit.freedesktop.org/libqmi/" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc static-libs test" - -RDEPEND=">=dev-libs/glib-2.32" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.0-python3.patch #464314 - if [[ ! -e configure ]] ; then - find -name Makefile.am -exec sed -i 's:^INCLUDES:AM_CPPFLAGS:' {} + || die - sed -i \ - -e 's:noinst_PROGRAMS:check_PROGRAMS:' \ - {cli/test,libqmi-glib/test}/Makefile.am || die - eautoreconf - fi -} - -src_configure() { - econf \ - --disable-more-warnings \ - $(use_enable static{-libs,}) \ - $(use_with doc{,s}) \ - $(use_with test{,s}) -} - -src_install() { - default - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la -} diff --git a/net-libs/libqmi/libqmi-1.10.2.ebuild b/net-libs/libqmi/libqmi-1.10.2.ebuild deleted file mode 100644 index 21f9932a0a9d..000000000000 --- a/net-libs/libqmi/libqmi-1.10.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit multilib -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" -fi - -DESCRIPTION="QMI modem protocol helper library" -HOMEPAGE="https://cgit.freedesktop.org/libqmi/" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc static-libs" - -RDEPEND=">=dev-libs/glib-2.32" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - [[ -e configure ]] || eautoreconf -} - -src_configure() { - econf \ - --disable-more-warnings \ - $(use_enable static{-libs,}) \ - $(use_enable {,gtk-}doc) -} - -src_install() { - default - use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la" -} diff --git a/net-libs/libqmi/libqmi-1.4.0.ebuild b/net-libs/libqmi/libqmi-1.4.0.ebuild deleted file mode 100644 index 73d7e2826748..000000000000 --- a/net-libs/libqmi/libqmi-1.4.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit multilib -if [[ ${PV} == "9999" ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi" -else - KEYWORDS="amd64 arm ~mips x86" - SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" -fi - -DESCRIPTION="QMI modem protocol helper library" -HOMEPAGE="https://cgit.freedesktop.org/libqmi/" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc static-libs test" - -RDEPEND=">=dev-libs/glib-2.32" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - [[ -e configure ]] || eautoreconf -} - -src_configure() { - econf \ - --disable-more-warnings \ - $(use_enable static{-libs,}) \ - $(use_enable {,gtk-}doc) \ - $(use_with test{,s}) -} - -src_install() { - default - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la -} diff --git a/net-libs/libqmi/libqmi-1.8.0.ebuild b/net-libs/libqmi/libqmi-1.8.0.ebuild deleted file mode 100644 index f2e3aa54108d..000000000000 --- a/net-libs/libqmi/libqmi-1.8.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit multilib -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}" -else - KEYWORDS="amd64 arm ~mips x86" - SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" -fi - -DESCRIPTION="QMI modem protocol helper library" -HOMEPAGE="https://cgit.freedesktop.org/libqmi/" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc static-libs" - -RDEPEND=">=dev-libs/glib-2.32" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - [[ -e configure ]] || eautoreconf -} - -src_configure() { - econf \ - --disable-more-warnings \ - $(use_enable static{-libs,}) \ - $(use_enable {,gtk-}doc) -} - -src_install() { - default - use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la" -} -- cgit v1.2.3-65-gdbad