[patch] revised ebuild patch

afflib.patch (text/plain), 5.07 KB, created by Ian Delaney (RETIRED) on 2011-11-24 21:20:45 UTC

diff -ur /mnt/gen2/old-portage/app-forensics/afflib//afflib-3.6.12.ebuild ../afflib//afflib-3.6.12.ebuild
--- afflib/afflib-3.6.12.ebuild	2011-07-25 02:31:03.000000000 +0800
+++ afflib/afflib-3.6.12.ebuild	2011-11-25 04:25:10.407832999 +0800
@@ -3,8 +3,8 @@
 # $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.12.ebuild,v 1.2 2011/07/24 18:23:44 armin76 Exp $
 
 EAPI="4"
-
-inherit eutils autotools
+PYTHON_DEPEND="python? 2"
+inherit eutils autotools python
 
 DESCRIPTION="Library that implements the AFF image standard"
 HOMEPAGE="http://www.afflib.org/"
@@ -20,17 +20,22 @@
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse )
 	ncurses? ( sys-libs/ncurses )
-	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	s3? ( net-misc/curl )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-python-module.patch
+pkg_setup() {
+	if use python; then
+		pyton_set_active_version 2
+		python_pkg_setup
+	fi
+}
 
+src_prepare() {
+#	epatch "${FILESDIR}"/${P}-python-module.patch
+	epatch "${FILESDIR}"/pyaff.patch
 	sed -i -e "/FLAGS/s: -g::" configure.ac
 	sed -i -e "/-static/d" tools/Makefile.am
-
 	eautoreconf
 }
 
diff -ur /mnt/gen2/old-portage/app-forensics/afflib//afflib-3.6.8.ebuild ../afflib//afflib-3.6.8.ebuild
--- afflib/afflib-3.6.8.ebuild	2011-10-12 01:31:03.000000000 +0800
+++ afflib/afflib-3.6.8.ebuild	2011-11-25 04:27:08.992832963 +0800
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.8.ebuild,v 1.5 2011/10/11 17:10:05 jer Exp $
 
-inherit eutils
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+inherit eutils python
 
 DESCRIPTION="Library that implements the AFF image standard"
 HOMEPAGE="http://www.afflib.org/"
@@ -17,14 +19,24 @@
 	ewf? ( app-forensics/libewf )
 	fuse? ( sys-fs/fuse )
 	ncurses? ( sys-libs/ncurses )
-	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	s3? ( net-misc/curl dev-libs/expat )
 	sys-libs/zlib
 	dev-libs/openssl"
 RDEPEND=${DEPEND}
 
-src_compile() {
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+        epatch "${FILESDIR}"/pyaff.patch
+}
+
+src_configure() {
 	econf \
 		$(use_enable fuse) \
 		$(use_enable ewf libewf) \
@@ -32,11 +44,14 @@
 		$(use_enable qemu) \
 		$(use_enable s3) \
 		$(use_enable threads threading)
-	emake || die "build failed"
+}
+
+src_compile() {
+	emake
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
+	emake install DESTDIR="${D}"
 	use s3 || {
 		rm -f "${D}/usr/bin/s3"
 	}
diff -ur /mnt/gen2/old-portage/app-forensics/afflib//files/afflib-3.6.12-python-module.patch ../afflib//files/afflib-3.6.12-python-module.patch
--- /mnt/gen2/old-portage/app-forensics/afflib//files/afflib-3.6.12-python-module.patch	2011-07-12 05:41:07.000000000 +0800
+++ ../afflib//files/afflib-3.6.12-python-module.patch	2011-11-21 18:11:24.614905407 +0800
@@ -4,8 +4,6 @@
  pyexec_LTLIBRARIES 	= pyaff.la
  
  pyaff_la_SOURCES	= pyaff.c
--pyaff_la_LIBADD		= ../lib/libafflib.la
-+pyaff_la_LIBADD		= @top_builddir@/lib/libafflib.la
  pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
 -pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
 +pyaff_la_LDFLAGS 	= -module -avoid-version -shared $(PYTHON_LDFLAGS)
# --------------------------------------------------------files/pyaff.patch------------------------------------------
diff -ur afflib-3.6.12.orif/pyaff/Makefile.am afflib-3.6.12/pyaff/Makefile.am
--- afflib-3.6.12.orif/pyaff/Makefile.am	2010-02-14 22:19:46.000000000 +0800
+++ afflib-3.6.12/pyaff/Makefile.am	2011-11-21 20:12:53.871903219 +0800
@@ -4,7 +4,7 @@
 AM_CFLAGS		= -I$(top_srcdir)/lib -include affconfig.h
 
 # This is for the pyaff python module
-pyexec_LTLIBRARIES 	= pyaff.la
+#pyexec_LTLIBRARIES 	= pyaff.la
 
 pyaff_la_SOURCES	= pyaff.c
 pyaff_la_LIBADD		= ../lib/libafflib.la
diff -ur afflib-3.6.12.orif/pyaff/Makefile.in afflib-3.6.12/pyaff/Makefile.in
--- afflib-3.6.12.orif/pyaff/Makefile.in	2011-05-24 06:08:34.000000000 +0800
+++ afflib-3.6.12/pyaff/Makefile.in	2011-11-21 20:13:27.270903211 +0800
@@ -219,7 +219,7 @@
 @HAVE_PYTHON_TRUE@AM_CFLAGS = -I$(top_srcdir)/lib -include affconfig.h
 
 # This is for the pyaff python module
-@HAVE_PYTHON_TRUE@pyexec_LTLIBRARIES = pyaff.la
+#@HAVE_PYTHON_TRUE@pyexec_LTLIBRARIES = pyaff.la
 @HAVE_PYTHON_TRUE@pyaff_la_SOURCES = pyaff.c
 @HAVE_PYTHON_TRUE@pyaff_la_LIBADD = ../lib/libafflib.la
 @HAVE_PYTHON_TRUE@pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
@@ -284,7 +284,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-pyaff.la: $(pyaff_la_OBJECTS) $(pyaff_la_DEPENDENCIES) 
+#pyaff.la: $(pyaff_la_OBJECTS) $(pyaff_la_DEPENDENCIES) 
 	$(pyaff_la_LINK) $(am_pyaff_la_rpath) $(pyaff_la_OBJECTS) $(pyaff_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
diff -ur afflib-3.6.12.orif/pyaff/pyaff.c afflib-3.6.12/pyaff/pyaff.c
--- afflib-3.6.12.orif/pyaff/pyaff.c	2008-09-17 16:00:31.000000000 +0800
+++ afflib-3.6.12/pyaff/pyaff.c	2011-11-21 20:13:35.035903207 +0800
@@ -35,7 +35,7 @@
 
 typedef struct {
     PyObject_HEAD
-    AFFILE *af;
+    AFFILE af;
     uint64_t size;
 } affile;