summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/qrencode/ChangeLog8
-rw-r--r--media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch45
-rw-r--r--media-gfx/qrencode/qrencode-3.3.0.ebuild24
3 files changed, 6 insertions, 71 deletions
diff --git a/media-gfx/qrencode/ChangeLog b/media-gfx/qrencode/ChangeLog
index bfd45712c9c3..510b9ffc1a9b 100644
--- a/media-gfx/qrencode/ChangeLog
+++ b/media-gfx/qrencode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/qrencode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.53 2014/12/09 10:31:44 joker Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.54 2015/03/15 13:44:57 joker Exp $
+
+ 15 Mar 2015; Christian Birchinger <joker@gentoo.org>
+ -files/qrencode-3.1.1-pngregenfix.patch, -qrencode-3.3.0.ebuild:
+ Remove old versions
*qrencode-3.4.4 (09 Dec 2014)
diff --git a/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch
deleted file mode 100644
index 9791c09b6407..000000000000
--- a/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN qrencode-3.1.1-orig/Makefile.am qrencode-3.1.1/Makefile.am
---- qrencode-3.1.1-orig/Makefile.am 2010-01-19 21:13:25.000000000 +0100
-+++ qrencode-3.1.1/Makefile.am 2011-01-31 09:21:17.000000000 +0100
-@@ -24,7 +24,7 @@
- pkgconfig_DATA = libqrencode.pc
-
- EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \
-- Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \
-+ Makefile.am qrencode.spec.in qrencode.spec \
- qrencode.1.in Doxyfile tests/test_all.sh
-
- if BUILD_TOOLS
-diff -ruN qrencode-3.1.1-orig/configure.ac qrencode-3.1.1/configure.ac
---- qrencode-3.1.1-orig/configure.ac 2010-02-03 01:42:12.000000000 +0100
-+++ qrencode-3.1.1/configure.ac 2011-01-31 09:21:17.000000000 +0100
-@@ -29,14 +29,14 @@
- AC_PROG_LIBTOOL
- PKG_PROG_PKG_CONFIG
-
--AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1])
-+AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1])
-
- dnl --with-tools
- AC_ARG_WITH([tools], [AC_HELP_STRING([--with-tools], [build utility tools [default=yes]])],
- [build_tools=$withval], [build_tools=yes])
- AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
- if test x$build_tools = xyes ; then
-- PKG_CHECK_MODULES(png, "libpng12")
-+ PKG_CHECK_MODULES(png, "libpng")
- fi
-
- dnl --with-tests
-@@ -54,12 +54,6 @@
- fi
-
-
--if test x$build_tests = xyes ; then
-- SDL_REQUIRED_VERSION=1.2.0
-- AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.]))
--fi
--AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
--
-
- dnl --enable-gprof
- AC_ARG_ENABLE([gprof], [AC_HELP_STRING([--enable-gprof], [generate extra code to write profile information suitable for gprof [default=no]])],
diff --git a/media-gfx/qrencode/qrencode-3.3.0.ebuild b/media-gfx/qrencode/qrencode-3.3.0.ebuild
deleted file mode 100644
index 1ab350d741ea..000000000000
--- a/media-gfx/qrencode/qrencode-3.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.3.0.ebuild,v 1.5 2012/05/29 19:22:39 ranger Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="http://fukuchi.org/works/qrencode/"
-SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-pngregenfix.patch" )