From cbae68f1326a22addbeafdd4a0bb213a83ada383 Mon Sep 17 00:00:00 2001 From: geos_one Date: Wed, 28 Jan 2009 11:17:42 +0000 Subject: [PATCH] app-admin/reprepro: Bump git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@722 6952d904-891a-0410-993b-d76249ca496b --- app-admin/reprepro/ChangeLog | 7 +- app-admin/reprepro/Manifest | 6 +- .../files/reprepro-3.8.1-db-4_5-1.patch | 76 +++++++++++++++++++ .../reprepro-3.8.1-gpgme-header-check-1.patch | 46 +++++++++++ app-admin/reprepro/reprepro-3.8.1.ebuild | 39 ++++++++++ 5 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 app-admin/reprepro/files/reprepro-3.8.1-db-4_5-1.patch create mode 100644 app-admin/reprepro/files/reprepro-3.8.1-gpgme-header-check-1.patch create mode 100644 app-admin/reprepro/reprepro-3.8.1.ebuild diff --git a/app-admin/reprepro/ChangeLog b/app-admin/reprepro/ChangeLog index ab8db1fb..4aa6610b 100644 --- a/app-admin/reprepro/ChangeLog +++ b/app-admin/reprepro/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for app-admin/reprepro -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Jan 2009; Mario Fetka + +files/reprepro-3.8.1-db-4_5-1.patch, + +files/reprepro-3.8.1-gpgme-header-check-1.patch, +reprepro-3.8.1.ebuild: + Bump + 21 Aug 2008; Mario Fetka reprepro-3.5.2.ebuild, +reprepro-3.6.1.ebuild: Bump diff --git a/app-admin/reprepro/Manifest b/app-admin/reprepro/Manifest index e3545f92..f9b78751 100644 --- a/app-admin/reprepro/Manifest +++ b/app-admin/reprepro/Manifest @@ -1,9 +1,13 @@ AUX reprepro-3.5.2-db-4_5-1.patch 2896 RMD160 bc71fcea4b121181ecf241edb666460f685ef4ab SHA1 a6ffc122cc8c1e6b749ab16f7815a065cec12ddd SHA256 8233b53505fcc61dd8c357d181b462c6c7dc7bbf36c4fc3d7723946db60d2c60 AUX reprepro-3.5.2-gpgme-header-check-1.patch 2169 RMD160 56524920aedf780765683cfebf2f93e9c326bad2 SHA1 4afea249de8c2ec8208da091cf5826dca06707cf SHA256 c2e9a12a8e640047782b9bd4158abbe0fce8d887d9e2df7c3bbe88bb6eb63683 +AUX reprepro-3.8.1-db-4_5-1.patch 2957 RMD160 9cb4e5afec4e106f7969af059d3f52f41c1e846e SHA1 c6ecb465a5a53da538b99eb6d66ac313582b7475 SHA256 0114338796e8c8b8133fbce923c59f5f0eee765324ade0aeb462b55ad6bcf052 +AUX reprepro-3.8.1-gpgme-header-check-1.patch 2174 RMD160 8c61d4132cfeb033a85187e199ee1ab728606609 SHA1 07ae59d9f784fe3166ff1ebbfe6463ce01d53974 SHA256 4b30c99badf145cafa1a5aa449e4b3cde07f932c96b3a8802a034ff0a59e85e2 DIST 3.5.2.orig.tar.gz 453961 RMD160 92ab8f1b056daabe35e8a72d626a8da6552798fd SHA1 594879d201359a7ed0372e2a570a49ca2f92723b SHA256 3cd911a899aed7aa7783aed502a9dcb7dcd4531ec32752738fbb0ca42f8d94d7 DIST reprepro_3.5.2.orig.tar.gz 453961 RMD160 92ab8f1b056daabe35e8a72d626a8da6552798fd SHA1 594879d201359a7ed0372e2a570a49ca2f92723b SHA256 3cd911a899aed7aa7783aed502a9dcb7dcd4531ec32752738fbb0ca42f8d94d7 DIST reprepro_3.6.1.orig.tar.gz 460754 RMD160 f8f748423d164ceff18099f589989d2350eebd26 SHA1 566364b7f4fd1ef7cefbd40407a7e1b94cfd1e59 SHA256 3bc09bc7ff77538feac295d09eb20b01f4e0cd0b9cc740be718d2f6753b07a18 +DIST reprepro_3.8.1.orig.tar.gz 509461 RMD160 9398b71be515ebc14a91ecc6edb39bebf472cbdf SHA1 7652d7a1c11cfd6a73b7593d156cf0a877767d96 SHA256 124bbfa0613821e05633af42b7eda2bfa1b5e6b5e3fc8e724919ab0e18aeb03a EBUILD reprepro-3.5.2.ebuild 963 RMD160 44dc55abc9384d1193f303e062d35b7752d16bb9 SHA1 d9360e19f35143fdd4c840d18622e3cd4d84feac SHA256 c79d36ac870999b92421a2f807e063d2772515e566ec83236d1e51ceddc4ceb8 EBUILD reprepro-3.6.1.ebuild 916 RMD160 5568cba4b32d9211a38abcf08e50767baa8be706 SHA1 375ae8db76a78547f8af064a664d1acf9206b183 SHA256 111a8c06e3ebfc69126a0ffe900bbbb8069551435ecdeb9f9c1043a16c25129e -MISC ChangeLog 427 RMD160 d08132310e92a0c997ba9622512bb91cd0f356d6 SHA1 4266ef5c9cb9cd044fbb71e93fd2ff087b64e725 SHA256 68d5694d08f5cd5440d1b076c68b1c01926d6f9cd428d18fb9c1d1376aeeed5a +EBUILD reprepro-3.8.1.ebuild 939 RMD160 bbaeb94844d32ac0deb6fead21478401e8252d1b SHA1 dd13af969df6b5762eb70862f1387885b5c55fad SHA256 8d0388e3cbb0c969438841ed3341ef5fedd8f6bd27b4f29789b59971a4050d40 +MISC ChangeLog 602 RMD160 068ce5673892b6aabc49431c740dd935abeb5b20 SHA1 e1177d8f044cab782874bb87e2fd6cc77eeb6cdc SHA256 14c93ed09c51ae088a38aee83efcc3e40f8a415ee1134ff2f6408a96c8e51dd8 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-admin/reprepro/files/reprepro-3.8.1-db-4_5-1.patch b/app-admin/reprepro/files/reprepro-3.8.1-db-4_5-1.patch new file mode 100644 index 00000000..f533b325 --- /dev/null +++ b/app-admin/reprepro/files/reprepro-3.8.1-db-4_5-1.patch @@ -0,0 +1,76 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2009-01-28 +Initial Package Version: 3.5.2 +Origin: me +Upstream Status: unknown +Description: add support for db 4.5 + +diff -Naur reprepro-3.8.1.orig/configure.ac reprepro-3.8.1/configure.ac +--- reprepro-3.8.1.orig/configure.ac 2009-01-28 11:05:36.195261912 +0000 ++++ reprepro-3.8.1/configure.ac 2009-01-28 11:08:19.502260024 +0000 +@@ -26,7 +26,7 @@ + DBCPPFLAGS="" + AH_TEMPLATE([LIBDB_VERSION],[variant of libdb used]) + AC_ARG_WITH(libdb, +-[ --with-libdb=path|4.7|4.6|4.4|4.3|3 Give prefix of libdb or specify version to use],[dnl ++[ --with-libdb=path|4.7|4.6|4.5|4.4|4.3|3 Give prefix of libdb or specify version to use],[dnl + case "$withval" in + no) + AC_MSG_ERROR(["Cannot compile without libdb"]); +@@ -40,6 +40,9 @@ + 4.4) + DB_WANT_VERSION=4.4 + ;; ++ 4.5) ++ DB_WANT_VERSION=4.5 ++ ;; + 4.6) + DB_WANT_VERSION=4.6 + ;; +@@ -86,6 +89,12 @@ + elif test "$DB_WANT_VERSION" != "4.4" ; then + AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION]) + fi ++elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x5" ; then ++ if test "$DB_WANT_VERSION" = "any" ; then ++ DB_WANT_VERSION=4.5 ++ elif test "$DB_WANT_VERSION" != "4.5" ; then ++ AC_MSG_ERROR([Found libdb major version $DB_VERSION_MAJOR.$DB_VERSION_MINOR, need $DB_WANT_VERSION]) ++ fi + elif test "x$DB_VERSION_MAJOR" = "x4" -a "x$DB_VERSION_MINOR" = "x6" ; then + if test "$DB_WANT_VERSION" = "any" ; then + DB_WANT_VERSION=4.6 +@@ -103,7 +112,7 @@ + fi + else + AC_MSG_ERROR([Unsupported libdb major $DB_VERSION_MAJOR minor $DB_VERSION_MINOR +-Only 4.6 (recommended) or 3.2 or 4.4 or 4.3 or 4.7 are supported]) ++Only 4.6 (recommended) or 3.2 or 4.3 or 4.4 or 4.5 or 4.7 are supported]) + fi + + # now we have a header with the expected version, check for the library: +@@ -120,6 +129,12 @@ + DBLIBS="-ldb-4.6 $DBLIBS" + ],[AC_MSG_ERROR(["no libdb-4.6 found"])],[$DBLIBS]) + ;; ++4.5) ++ AC_CHECK_LIB(db-4.5,db_create,[dnl ++ AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),45) ++ DBLIBS="-ldb-4.5 $DBLIBS" ++ ],[AC_MSG_ERROR(["no libdb-4.5 found"])],[$DBLIBS]) ++;; + 4.4) + AC_CHECK_LIB(db-4.4,db_create,[dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP(LIBDB_VERSION),44) +diff -Naur reprepro-3.8.1.orig/database.c reprepro-3.8.1/database.c +--- reprepro-3.8.1.orig/database.c 2009-01-28 11:05:36.201260707 +0000 ++++ reprepro-3.8.1/database.c 2009-01-28 11:09:32.589262903 +0000 +@@ -246,6 +246,8 @@ + #elif LIBDB_VERSION == 47 + #warning libdb4.7 not yet tested. Use on your own risk + #define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664) ++#elif LIBDB_VERSION == 45 ++#define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664) + #elif LIBDB_VERSION == 44 + #define DB_OPEN(database,filename,name,type,flags) database->open(database,NULL,filename,name,type,flags,0664) + #elif LIBDB_VERSION == 43 diff --git a/app-admin/reprepro/files/reprepro-3.8.1-gpgme-header-check-1.patch b/app-admin/reprepro/files/reprepro-3.8.1-gpgme-header-check-1.patch new file mode 100644 index 00000000..016b1f41 --- /dev/null +++ b/app-admin/reprepro/files/reprepro-3.8.1-gpgme-header-check-1.patch @@ -0,0 +1,46 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2009-01-28 +Initial Package Version: 3.5.2 +Origin: hron@hronszoft.dyndns.biz +Upstream Status: gentoo specific +Description: find gpgme.h + +diff -Naur reprepro-3.8.1.orig/configure.ac reprepro-3.8.1/configure.ac +--- reprepro-3.8.1.orig/configure.ac 2009-01-28 10:55:34.423017172 +0000 ++++ reprepro-3.8.1/configure.ac 2009-01-28 10:57:08.469016466 +0000 +@@ -152,20 +152,20 @@ + no) + ;; + yes) +- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])]) ++ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])]) + AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],) + AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],) + ;; + *) + CPPFLAGS="$CPPFLAGS -I$withval/include" + LIBS="$LIBS -L$withval/lib" +- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found"])]) ++ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found"])]) + AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found"])],) + AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["no libgpgme found (need at least 0.4.1)"])],) + ;; + esac + ],[dnl default is to behave like yes (for libgpgme only) +- AC_CHECK_HEADER(gpgme.h,,[AC_MSG_ERROR(["no gpgme.h found (to disable run with --without-libgpgme)"])]) ++ AC_CHECK_HEADER(gpgme/gpgme.h,,[AC_MSG_ERROR(["no gpgme/gpgme.h found (to disable run with --without-libgpgme)"])]) + AC_CHECK_LIB(gpg-error,gpg_strsource,,[AC_MSG_ERROR(["no libgpg-error found (to disable run with --without-libgpgme)"])],) + AC_CHECK_LIB(gpgme,gpgme_get_protocol_name,,[AC_MSG_ERROR(["did not find libgpgme versoion 0.4.1 or later (to disable run with --without-libgpgme)"])],) + ]) +diff -Naur reprepro-3.8.1.orig/signature.c reprepro-3.8.1/signature.c +--- reprepro-3.8.1.orig/signature.c 2009-01-28 10:55:34.412015470 +0000 ++++ reprepro-3.8.1/signature.c 2009-01-28 10:58:59.871258599 +0000 +@@ -27,7 +27,7 @@ + #include + #ifdef HAVE_LIBGPGME + #include +-#include ++#include + #endif + #include "globals.h" + #include "error.h" diff --git a/app-admin/reprepro/reprepro-3.8.1.ebuild b/app-admin/reprepro/reprepro-3.8.1.ebuild new file mode 100644 index 00000000..c04cac4a --- /dev/null +++ b/app-admin/reprepro/reprepro-3.8.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils autotools + +SRC_URI="mirror://debian/pool/main/r/${PN}/${PN}_${PV}.orig.tar.gz" +DESCRIPTION="Debian repository creator and maintainer application" +HOMEPAGE="http://packages.debian.org/reprepro" +DEPEND="app-arch/bzip2 + app-arch/gzip + app-arch/libarchive + app-crypt/gpgme + dev-libs/libgpg-error + >=sys-libs/db-4.3" + +KEYWORDS="~x86 ~amd64" +IUSE="bzip2" +LICENSE="GPL-2" +SLOT="0" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.8.1-gpgme-header-check-1.patch + epatch "${FILESDIR}"/${PN}-3.8.1-db-4_5-1.patch + eautoreconf +} + +src_compile() { + local myconf="--with-libarchive=yes" + use bzip2 && myconf="${myconf} --with-libbz2=yes" || myconf="${myconf} --with-libbz2=no" + econf ${myconf} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install +}