From 3a8f350c5acd457ea64eb0d07272387171073da5 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Sun, 26 Feb 2006 09:06:56 +0000 Subject: Remove obsolete versions. Fix broken compilation on gcc-4.1 (#122223). Cleanup ebuild code. Package-Manager: portage-2.0.54 --- app-mobilephone/gsmlib/ChangeLog | 10 ++++- app-mobilephone/gsmlib/Manifest | 19 ++++---- app-mobilephone/gsmlib/files/digest-gsmlib-1.10 | 1 - .../gsmlib/files/digest-gsmlib-1.11_pre030826 | 1 - .../gsmlib/files/gsmlib-1.11-gcc41.patch | 52 ++++++++++++++++++++++ app-mobilephone/gsmlib/gsmlib-1.10.ebuild | 24 ---------- .../gsmlib/gsmlib-1.11_pre030826.ebuild | 38 ---------------- .../gsmlib/gsmlib-1.11_pre041028.ebuild | 29 ++++-------- app-mobilephone/gsmlib/metadata.xml | 2 +- 9 files changed, 78 insertions(+), 98 deletions(-) delete mode 100644 app-mobilephone/gsmlib/files/digest-gsmlib-1.10 delete mode 100644 app-mobilephone/gsmlib/files/digest-gsmlib-1.11_pre030826 create mode 100644 app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch delete mode 100644 app-mobilephone/gsmlib/gsmlib-1.10.ebuild delete mode 100644 app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild (limited to 'app-mobilephone') diff --git a/app-mobilephone/gsmlib/ChangeLog b/app-mobilephone/gsmlib/ChangeLog index 4ded8f1b16ae..0cd200a4a752 100644 --- a/app-mobilephone/gsmlib/ChangeLog +++ b/app-mobilephone/gsmlib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-mobilephone/gsmlib -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/ChangeLog,v 1.5 2005/08/17 13:14:24 gustavoz Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/ChangeLog,v 1.6 2006/02/26 09:06:56 mrness Exp $ + + 26 Feb 2006; Alin Nastac + +files/gsmlib-1.11-gcc41.patch, metadata.xml, -gsmlib-1.10.ebuild, + -gsmlib-1.11_pre030826.ebuild, gsmlib-1.11_pre041028.ebuild: + Remove obsolete versions. Fix broken compilation on gcc-4.1 (#122223). + Cleanup ebuild code. 17 Aug 2005; Gustavo Zacarias gsmlib-1.11_pre041028.ebuild: diff --git a/app-mobilephone/gsmlib/Manifest b/app-mobilephone/gsmlib/Manifest index 0054a4281e70..ed75f62aff5a 100644 --- a/app-mobilephone/gsmlib/Manifest +++ b/app-mobilephone/gsmlib/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 ede64d111ad9daedeb8b34b0d655b716 gsmlib-1.11_pre030826.ebuild 811 -MD5 000da42d4ab1227504f2505b02064951 metadata.xml 254 -MD5 7d26b4ade36bb8155f0c3cfef600655b gsmlib-1.10.ebuild 600 -MD5 b3cc0d8a91cf7adbc794a1f7905ecd86 gsmlib-1.11_pre041028.ebuild 847 -MD5 12b52250c17d03ccbff8b96e1daef8d8 ChangeLog 2206 +MD5 2605fa64bdad71466461a626cdf3d48a ChangeLog 2480 MD5 40a642b1fa81b93d94d9ada2cada37d0 files/digest-gsmlib-1.11_pre041028 73 -MD5 9358266ac12314de9a89dc071fbd6485 files/digest-gsmlib-1.11_pre030826 73 +MD5 203e163918b6eaed97f51b5e99c8e5d7 files/gsmlib-1.11-gcc41.patch 2110 MD5 5cf9803b268e78717cf97deb06f9a2ce files/gsmlib-1.11-include-gcc34-fix.patch 1436 -MD5 ca07bc08da15e439dfee58227b2255f5 files/digest-gsmlib-1.10 63 +MD5 d70a9e41f1eb3fe665a7bb9490eba297 gsmlib-1.11_pre041028.ebuild 800 +MD5 3c58cfa3377dd3eb84443f28282bc08e metadata.xml 254 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) +Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFDAzhFKRy60XGEcJIRAlX6AJ9TMIxknptfKzYeqscYfQepKqsCRgCgoahm -8MUGZkJAoo1dteCCmdJ7Oxw= -=JFm2 +iD8DBQFEAW/0jG8pv1lIUX4RAiBBAJ9rUFceZevNgoN5R0udcIlV+KnajQCaAqpm +NQm5elbSUw+2JZAFU7AeI2U= +=nam8 -----END PGP SIGNATURE----- diff --git a/app-mobilephone/gsmlib/files/digest-gsmlib-1.10 b/app-mobilephone/gsmlib/files/digest-gsmlib-1.10 deleted file mode 100644 index d824df38686d..000000000000 --- a/app-mobilephone/gsmlib/files/digest-gsmlib-1.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 deea4ce2e4f5f1965d32d576597d3ff4 gsmlib-1.10.tar.gz 474591 diff --git a/app-mobilephone/gsmlib/files/digest-gsmlib-1.11_pre030826 b/app-mobilephone/gsmlib/files/digest-gsmlib-1.11_pre030826 deleted file mode 100644 index 1d3736f5dc37..000000000000 --- a/app-mobilephone/gsmlib/files/digest-gsmlib-1.11_pre030826 +++ /dev/null @@ -1 +0,0 @@ -MD5 f71e0a8ac396d2fd0ba45fc61727d671 gsmlib-pre1.11-030826.tar.gz 477171 diff --git a/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch new file mode 100644 index 000000000000..a7414e36b86c --- /dev/null +++ b/app-mobilephone/gsmlib/files/gsmlib-1.11-gcc41.patch @@ -0,0 +1,52 @@ +diff -ur gsmlib-1.11-orig/gsmlib/gsm_map_key.h gsmlib-1.11/gsmlib/gsm_map_key.h +--- gsmlib-1.11-orig/gsmlib/gsm_map_key.h 2006-02-25 19:20:52.000000000 -0500 ++++ gsmlib-1.11/gsmlib/gsm_map_key.h 2006-02-25 19:23:01.000000000 -0500 +@@ -78,7 +78,7 @@ + // MapKey members + + template +- bool gsmlib::operator<(const MapKey &x, ++ bool operator<(const MapKey &x, + const MapKey &y) + { + assert(&x._myStore == &y._myStore); +@@ -103,7 +103,7 @@ + } + + template +- bool gsmlib::operator==(const MapKey &x, ++ bool operator==(const MapKey &x, + const MapKey &y) + { + assert(&x._myStore == &y._myStore); +diff -ur gsmlib-1.11-orig/gsmlib/gsm_me_ta.h gsmlib-1.11/gsmlib/gsm_me_ta.h +--- gsmlib-1.11-orig/gsmlib/gsm_me_ta.h 2006-02-25 19:20:52.000000000 -0500 ++++ gsmlib-1.11/gsmlib/gsm_me_ta.h 2006-02-25 19:21:48.000000000 -0500 +@@ -294,8 +294,8 @@ + // 3 disable phone receive RF circuits only + // 4 disable phone both transmit and receive RF circuits + // 5...127 implementation-defined +- int MeTa::getFunctionalityLevel() throw(GsmException); +- void MeTa::setFunctionalityLevel(int level) throw(GsmException); ++ int getFunctionalityLevel() throw(GsmException); ++ void setFunctionalityLevel(int level) throw(GsmException); + + // return battery charge status (+CBC): + // 0 ME is powered by the battery +@@ -389,13 +389,13 @@ + void setCallWaitingLockStatus(FacilityClass cl, + bool lock)throw(GsmException); + +- void MeTa::setCLIRPresentation(bool enable) throw(GsmException); ++ void setCLIRPresentation(bool enable) throw(GsmException); + //(+CLIR) + + // 0:according to the subscription of the CLIR service + // 1:CLIR invocation + // 2:CLIR suppression +- int MeTa::getCLIRPresentation() throw(GsmException); ++ int getCLIRPresentation() throw(GsmException); + + friend class Phonebook; + friend class SMSStore; + diff --git a/app-mobilephone/gsmlib/gsmlib-1.10.ebuild b/app-mobilephone/gsmlib/gsmlib-1.10.ebuild deleted file mode 100644 index 7a2ff585f7ac..000000000000 --- a/app-mobilephone/gsmlib/gsmlib-1.10.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.10.ebuild,v 1.1 2005/05/15 20:19:12 mrness Exp $ - -IUSE="" -DESCRIPTION="Library and Applications to access GSM mobile phones" -SRC_URI="http://www.pxh.de/fs/gsmlib/download/${P}.tar.gz" -HOMEPAGE="http://www.pxh.de/fs/gsmlib/" - -DEPEND="virtual/libc" - -SLOT="0" -LICENSE="LGPL-2" -KEYWORDS="x86 ppc sparc" - -src_compile() { - econf || die - make || die -} - -src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS NEWS README -} diff --git a/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild b/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild deleted file mode 100644 index 3e8b31248c85..000000000000 --- a/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.11_pre030826.ebuild,v 1.3 2005/06/23 01:15:43 agriffis Exp $ - -inherit eutils - -RESTRICT="test" - -MY_A=${PN}-pre${PV%_pre*}-${PV#*_pre} - -DESCRIPTION="Library and Applications to access GSM mobile phones" -SRC_URI="http://www.pxh.de/fs/gsmlib/snapshots/${MY_A}.tar.gz" -HOMEPAGE="http://www.pxh.de/fs/gsmlib/" - -DEPEND="" - -IUSE="" -SLOT="0" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ppc sparc x86" - -S=${WORKDIR}/${PN}-${PV%_pre*} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/gsmlib-1.11-include-gcc34-fix.patch -} - -src_compile() { - econf || die - make || die -} - -src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS NEWS README -} diff --git a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild index 86bd78bd8d96..fdb029277462 100644 --- a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild +++ b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild @@ -1,17 +1,13 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild,v 1.5 2005/08/17 13:14:24 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild,v 1.6 2006/02/26 09:06:56 mrness Exp $ inherit eutils -MY_A=${PN}-pre${PV%_pre*}-${PV#*_pre} - -DESCRIPTION="Library and Applications to access GSM mobile phones" -SRC_URI="http://www.pxh.de/fs/gsmlib/snapshots/${MY_A}.tar.gz" +DESCRIPTION="Library and applications to access GSM mobile phones" +SRC_URI="http://www.pxh.de/fs/gsmlib/snapshots/${PN}-pre${PV%_pre*}-${PV#*_pre}.tar.gz" HOMEPAGE="http://www.pxh.de/fs/gsmlib/" -DEPEND="" - IUSE="" SLOT="0" LICENSE="LGPL-2" @@ -19,24 +15,17 @@ KEYWORDS="~amd64 ppc sparc x86" RESTRICT="test" -S=${WORKDIR}/${PN}-${PV%_pre*} +S="${WORKDIR}/${PN}-${PV%_pre*}" src_unpack() { unpack ${A} - cd ${S} - - # Fix gsm_map_key.h for gsm_map_key.h - epatch ${FILESDIR}/gsmlib-1.11-include-gcc34-fix.patch - -} -src_compile() { - econf - emake || die + epatch "${FILESDIR}/${P%_pre*}-include-gcc34-fix.patch" + epatch "${FILESDIR}/${P%_pre*}-gcc41.patch" } src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS NEWS README + make DESTDIR="${D}" install || die "make install failed" + dodoc Changelog README } diff --git a/app-mobilephone/gsmlib/metadata.xml b/app-mobilephone/gsmlib/metadata.xml index 8bc51375ed2e..f96649332970 100644 --- a/app-mobilephone/gsmlib/metadata.xml +++ b/app-mobilephone/gsmlib/metadata.xml @@ -2,5 +2,5 @@ mobile-phone -Library and Applications to access GSM mobile phones. +Library and applications to access GSM mobile phones. -- cgit v1.2.3-65-gdbad