Revision bump in order to remove static library and libtool archive. Bump the eapi...
authorTomas Chvatal <scarabeus@gentoo.org>
Fri, 9 Sep 2011 16:55:48 +0000 (16:55 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Fri, 9 Sep 2011 16:55:48 +0000 (16:55 +0000)
Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64
RepoMan-Options: --force

dev-libs/libg15/ChangeLog
dev-libs/libg15/libg15-1.2.2.ebuild [deleted file]
dev-libs/libg15/libg15-1.2.5.ebuild [deleted file]
dev-libs/libg15/libg15-1.2.7-r1.ebuild [moved from dev-libs/libg15/libg15-1.2.7.ebuild with 55% similarity]
dev-libs/libg15render/ChangeLog
dev-libs/libg15render/libg15render-1.2-r2.ebuild [moved from dev-libs/libg15render/libg15render-1.2-r1.ebuild with 60% similarity]

index f43aa434c96d4840111ddb7139ab662fbc157159..be9201b9e33c7dad3effc56a67a24dc53c79da20 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libg15
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/ChangeLog,v 1.26 2010/03/09 21:52:36 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/ChangeLog,v 1.27 2011/09/09 16:55:47 scarabeus Exp $
+
+*libg15-1.2.7-r1 (09 Sep 2011)
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libg15-1.2.2.ebuild,
+  -libg15-1.2.5.ebuild, -libg15-1.2.7.ebuild, +libg15-1.2.7-r1.ebuild:
+  Revision bump in order to remove static library and libtool archive. Bump the
+  eapi to 4.
 
   09 Mar 2010; Joseph Jezak <josejx@gentoo.org> libg15-1.2.5.ebuild,
   libg15-1.2.7.ebuild:
diff --git a/dev-libs/libg15/libg15-1.2.2.ebuild b/dev-libs/libg15/libg15-1.2.2.ebuild
deleted file mode 100644 (file)
index 88e97e9..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.2.ebuild,v 1.5 2009/05/16 09:13:21 robbat2 Exp $
-
-DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
-IUSE=""
-
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc AUTHORS README ChangeLog
-}
diff --git a/dev-libs/libg15/libg15-1.2.5.ebuild b/dev-libs/libg15/libg15-1.2.5.ebuild
deleted file mode 100644 (file)
index bba2e85..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.5.ebuild,v 1.5 2010/03/09 21:52:36 josejx Exp $
-
-DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc AUTHORS README ChangeLog
-}
similarity index 55%
rename from dev-libs/libg15/libg15-1.2.7.ebuild
rename to dev-libs/libg15/libg15-1.2.7-r1.ebuild
index e25bab1d24b389a042b6c5978fcfac346c7d4df0..efa5ef73412d5100218e436309ff5521d7be2ea4 100644 (file)
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.7.ebuild,v 1.4 2010/03/09 21:52:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.7-r1.ebuild,v 1.1 2011/09/09 16:55:47 scarabeus Exp $
+
+EAPI=4
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
 HOMEPAGE="http://g15tools.sourceforge.net/"
@@ -14,7 +16,15 @@ IUSE=""
 DEPEND="=virtual/libusb-0*"
 RDEPEND=${DEPEND}
 
+DOCS=( AUTHORS README ChangeLog )
+
+src_configure() {
+       econf \
+               --disable-static
+}
+
 src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-       dodoc AUTHORS README ChangeLog
+       default
+
+       find "${ED}" -name '*.la' -exec rm -f {} +
 }
index 2e252600b1e3d595019777fb486e98acf3374243..b7a04ef5a6b6752467d74eff203157da3cacb876 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libg15render
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/ChangeLog,v 1.13 2010/03/06 20:19:01 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/ChangeLog,v 1.14 2011/09/09 16:51:21 scarabeus Exp $
+
+*libg15render-1.2-r2 (09 Sep 2011)
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libg15render-1.2-r1.ebuild, +libg15render-1.2-r2.ebuild:
+  Revision bump in order to remove static library and libtool archive. Bump the
+  eapi to 4.
 
   06 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Changing maintainer per emails of Jan 18th.
similarity index 60%
rename from dev-libs/libg15render/libg15render-1.2-r1.ebuild
rename to dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 5c8a8d9c8880bfb6362dfe050401ab1e8a819189..8cdc988fd8a2da607f5ae698d8204313f5c65231 100644 (file)
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/libg15render-1.2-r1.ebuild,v 1.6 2007/05/01 10:33:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/libg15render-1.2-r2.ebuild,v 1.1 2011/09/09 16:51:21 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils
 
@@ -14,30 +16,26 @@ KEYWORDS="amd64 ppc ppc64 x86"
 
 IUSE="truetype"
 
-DEPEND="dev-libs/libg15
-       truetype? ( media-libs/freetype )"
-
-RDEPEND=${DEPEND}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+RDEPEND="
+       dev-libs/libg15
+       truetype? ( media-libs/freetype )
+"
+DEPEND=${RDEPEND}
 
+src_prepare() {
        epatch "${FILESDIR}/${P}-pixel-c.patch"
 }
 
-src_compile() {
+src_configure() {
        econf \
-               $(use_enable truetype ttf ) \
-               || die "configure failed"
-
-       emake || die "make failed"
+               --disable-static \
+               $(use_enable truetype ttf )
 }
 
 src_install() {
        emake DESTDIR="${D}" \
                docdir=/usr/share/doc/${PF} install || die "make install failed"
-       rm "${D}/usr/share/doc/${PF}/COPYING"
+       rm "${ED}/usr/share/doc/${PF}/COPYING"
 
-       prepalldocs
+       find "${ED}" -name '*.la' -exec rm -f {} +
 }